Using saved parent location: http://bzr.savannah.gnu.org/r/emacs/trunk/ Now on revision 100920. ------------------------------------------------------------ revno: 100920 author: Aaron S. Hawley committer: Juanma Barranquero branch nick: trunk timestamp: Wed 2010-07-28 01:38:46 +0200 message: * emacs-lisp/re-builder.el: Remove references to package `lisp-re' (bug#4369). diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2010-07-27 16:37:25 +0000 +++ lisp/ChangeLog 2010-07-27 23:38:46 +0000 @@ -1,3 +1,9 @@ +2010-07-27 Aaron S. Hawley + + * emacs-lisp/re-builder.el (reb-re-syntax, reb-lisp-mode) + (reb-lisp-syntax-p, reb-change-syntax, reb-cook-regexp): + Remove references to package `lisp-re' (bug#4369). + 2010-07-27 Tom Tromey * progmodes/js.el (js-mode): === modified file 'lisp/emacs-lisp/re-builder.el' --- lisp/emacs-lisp/re-builder.el 2010-01-13 08:35:10 +0000 +++ lisp/emacs-lisp/re-builder.el 2010-07-27 23:38:46 +0000 @@ -61,14 +61,12 @@ ;; this limit allowing an easy way to see all matches. ;; Currently `re-builder' understands five different forms of input, -;; namely `read', `string', `rx', `sregex' and `lisp-re' syntax. Read +;; namely `read', `string', `rx', and `sregex' syntax. Read ;; syntax and string syntax are both delimited by `"'s and behave ;; according to their name. With the `string' syntax there's no need ;; to escape the backslashes and double quotes simplifying the editing ;; somewhat. The other three allow editing of symbolic regular -;; expressions supported by the packages of the same name. (`lisp-re' -;; is a package by me and its support may go away as it is nearly the -;; same as the `sregex' package in Emacs) +;; expressions supported by the packages of the same name. ;; Editing symbolic expressions is done through a major mode derived ;; from `emacs-lisp-mode' so you'll get all the good stuff like @@ -128,12 +126,11 @@ (defcustom reb-re-syntax 'read "Syntax for the REs in the RE Builder. -Can either be `read', `string', `sregex', `lisp-re', `rx'." +Can either be `read', `string', `sregex', or `rx'." :group 're-builder :type '(choice (const :tag "Read syntax" read) (const :tag "String syntax" string) (const :tag "`sregex' syntax" sregex) - (const :tag "`lisp-re' syntax" lisp-re) (const :tag "`rx' syntax" rx))) (defcustom reb-auto-match-limit 200 @@ -281,9 +278,8 @@ (define-derived-mode reb-lisp-mode emacs-lisp-mode "RE Builder Lisp" "Major mode for interactively building symbolic Regular Expressions." - (cond ((eq reb-re-syntax 'lisp-re) ; Pull in packages - (require 'lisp-re)) ; as needed - ((eq reb-re-syntax 'sregex) ; sregex is not autoloaded + ;; Pull in packages as needed + (cond ((eq reb-re-syntax 'sregex) ; sregex is not autoloaded (require 'sregex)) ; right now.. ((eq reb-re-syntax 'rx) ; rx-to-string is autoloaded (require 'rx))) ; require rx anyway @@ -329,7 +325,7 @@ (defsubst reb-lisp-syntax-p () "Return non-nil if RE Builder uses a Lisp syntax." - (memq reb-re-syntax '(lisp-re sregex rx))) + (memq reb-re-syntax '(sregex rx))) (defmacro reb-target-binding (symbol) "Return binding for SYMBOL in the RE Builder target buffer." @@ -489,10 +485,10 @@ (list (intern (completing-read "Select syntax: " (mapcar (lambda (el) (cons (symbol-name el) 1)) - '(read string lisp-re sregex rx)) + '(read string sregex rx)) nil t (symbol-name reb-re-syntax))))) - (if (memq syntax '(read string lisp-re sregex rx)) + (if (memq syntax '(read string sregex rx)) (let ((buffer (get-buffer reb-buffer))) (setq reb-re-syntax syntax) (when buffer @@ -616,10 +612,7 @@ (defun reb-cook-regexp (re) "Return RE after processing it according to `reb-re-syntax'." - (cond ((eq reb-re-syntax 'lisp-re) - (when (fboundp 'lre-compile-string) - (lre-compile-string (eval (car (read-from-string re)))))) - ((eq reb-re-syntax 'sregex) + (cond ((eq reb-re-syntax 'sregex) (apply 'sregex (eval (car (read-from-string re))))) ((eq reb-re-syntax 'rx) (rx-to-string (eval (car (read-from-string re))))) ------------------------------------------------------------ revno: 100919 author: Tom Tromey committer: Juanma Barranquero branch nick: trunk timestamp: Tue 2010-07-27 18:37:25 +0200 message: Derive programming modes from prog-mode. * progmodes/js.el (js-mode): * progmodes/make-mode.el (makefile-mode): * progmodes/simula.el (simula-mode): * progmodes/tcl.el (tcl-mode): Derive from prog-mode. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2010-07-27 02:10:05 +0000 +++ lisp/ChangeLog 2010-07-27 16:37:25 +0000 @@ -1,3 +1,10 @@ +2010-07-27 Tom Tromey + + * progmodes/js.el (js-mode): + * progmodes/make-mode.el (makefile-mode): + * progmodes/simula.el (simula-mode): + * progmodes/tcl.el (tcl-mode): Derive from prog-mode. + 2010-07-27 Juanma Barranquero * help-fns.el (find-lisp-object-file-name): Doc fix (bug#6494). === modified file 'lisp/progmodes/js.el' --- lisp/progmodes/js.el 2010-06-22 07:04:20 +0000 +++ lisp/progmodes/js.el 2010-07-27 16:37:25 +0000 @@ -3268,7 +3268,7 @@ ;;; Main Function ;;;###autoload -(define-derived-mode js-mode nil "js" +(define-derived-mode js-mode prog-mode "js" "Major mode for editing JavaScript. Key bindings: === modified file 'lisp/progmodes/make-mode.el' --- lisp/progmodes/make-mode.el 2010-03-24 23:56:43 +0000 +++ lisp/progmodes/make-mode.el 2010-07-27 16:37:25 +0000 @@ -768,7 +768,7 @@ ;;; ------------------------------------------------------------ ;;;###autoload -(define-derived-mode makefile-mode nil "Makefile" +(define-derived-mode makefile-mode prog-mode "Makefile" "Major mode for editing standard Makefiles. If you are editing a file for a different make, try one of the === modified file 'lisp/progmodes/simula.el' --- lisp/progmodes/simula.el 2010-01-13 08:35:10 +0000 +++ lisp/progmodes/simula.el 2010-07-27 16:37:25 +0000 @@ -330,7 +330,7 @@ (popup-menu (cons (concat mode-name " Mode Commands") simula-mode-menu))) ;;;###autoload -(define-derived-mode simula-mode nil "Simula" +(define-derived-mode simula-mode prog-mode "Simula" "Major mode for editing SIMULA code. \\{simula-mode-map} Variables controlling indentation style: === modified file 'lisp/progmodes/tcl.el' --- lisp/progmodes/tcl.el 2010-01-13 08:35:10 +0000 +++ lisp/progmodes/tcl.el 2010-07-27 16:37:25 +0000 @@ -545,7 +545,7 @@ ;; ;;;###autoload -(define-derived-mode tcl-mode nil "Tcl" +(define-derived-mode tcl-mode prog-mode "Tcl" "Major mode for editing Tcl code. Expression and list commands understand all Tcl brackets. Tab indents for Tcl code. ------------------------------------------------------------ revno: 100918 committer: Dan Nicolaescu branch nick: trunk timestamp: Tue 2010-07-27 01:02:44 -0700 message: * src/emacs.c (Fkill_emacs): Remove return statement. diff: === modified file 'src/ChangeLog' --- src/ChangeLog 2010-07-27 04:20:51 +0000 +++ src/ChangeLog 2010-07-27 08:02:44 +0000 @@ -1,5 +1,7 @@ 2010-07-27 Dan Nicolaescu + * emacs.c (Fkill_emacs): Remove return statement. + * term.c (Qspace, QCalign_to, QCwidth): Remove declarations. (encode_terminal_code, produce_composite_glyph): Remove unused variables. (set_tty_color_mode, term_mouse_highlight, term_get_fkeys): Remove === modified file 'src/emacs.c' --- src/emacs.c 2010-07-27 03:52:35 +0000 +++ src/emacs.c 2010-07-27 08:02:44 +0000 @@ -2093,8 +2093,6 @@ unlink (SDATA (Vauto_save_list_file_name)); exit (INTEGERP (arg) ? XINT (arg) : EXIT_SUCCESS); - /* NOTREACHED */ - return Qnil; } ------------------------------------------------------------ revno: 100917 committer: Dan Nicolaescu branch nick: trunk timestamp: Mon 2010-07-26 21:20:51 -0700 message: Remove declarations and unused variables. * src/term.c (Qspace, QCalign_to, QCwidth): Remove declarations. (encode_terminal_code, produce_composite_glyph): Remove unused variables. (set_tty_color_mode, term_mouse_highlight, term_get_fkeys): Remove local extern declarations. diff: === modified file 'src/ChangeLog' --- src/ChangeLog 2010-07-27 04:12:42 +0000 +++ src/ChangeLog 2010-07-27 04:20:51 +0000 @@ -1,5 +1,10 @@ 2010-07-27 Dan Nicolaescu + * term.c (Qspace, QCalign_to, QCwidth): Remove declarations. + (encode_terminal_code, produce_composite_glyph): Remove unused variables. + (set_tty_color_mode, term_mouse_highlight, term_get_fkeys): Remove + local extern declarations. + * xmenu.c: Do not included lwlib.h, not needed. * m/iris4d.h (XUINT, XSET): Remove, not needed. === modified file 'src/term.c' --- src/term.c 2010-07-25 00:20:51 +0000 +++ src/term.c 2010-07-27 04:20:51 +0000 @@ -132,8 +132,6 @@ /* Display space properties */ -extern Lisp_Object Qspace, QCalign_to, QCwidth; - /* Functions to call after suspending a tty. */ Lisp_Object Vsuspend_tty_functions; @@ -712,7 +710,7 @@ } else { - unsigned char *p = SDATA (string), *pend = p + SBYTES (string); + unsigned char *p = SDATA (string); if (! STRING_MULTIBYTE (string)) string = string_to_multibyte (string); @@ -1383,7 +1381,6 @@ function key specification, rather than giving the user an error and refusing to run at all on such a terminal. */ - extern Lisp_Object Fidentity (Lisp_Object); term_get_fkeys_address = address; term_get_fkeys_kboard = kboard; internal_condition_case (term_get_fkeys_1, Qerror, Fidentity); @@ -1860,8 +1857,6 @@ static void produce_composite_glyph (struct it *it) { - int c; - if (it->cmp_it.ch < 0) { struct composition *cmp = composition_table[it->cmp_it.id]; @@ -2256,7 +2251,6 @@ Lisp_Object tem, val; Lisp_Object color_mode; int mode; - extern Lisp_Object Qtty_color_mode; Lisp_Object tty_color_mode_alist = Fintern_soft (build_string ("tty-color-mode-alist"), Qnil); @@ -2795,7 +2789,6 @@ /* Check for mouse-face. */ { - extern Lisp_Object Qmouse_face; Lisp_Object mouse_face, overlay, position, *overlay_vec; int noverlays, obegv, ozv; struct buffer *obuf;