Now on revision 112576. ------------------------------------------------------------ revno: 112576 committer: Leo Liu branch nick: trunk timestamp: Tue 2013-05-14 13:19:29 +0800 message: * progmodes/octave.el (octave-font-lock-keywords): Fix error during redisplay. (octave-goto-function-definition, octave-find-definition): Minor tweaks. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2013-05-14 02:42:17 +0000 +++ lisp/ChangeLog 2013-05-14 05:19:29 +0000 @@ -1,3 +1,9 @@ +2013-05-14 Leo Liu + + * progmodes/octave.el (octave-font-lock-keywords): Fix error + during redisplay. + (octave-goto-function-definition, octave-find-definition): Minor tweaks. + 2013-05-14 Glenn Morris * progmodes/flymake.el (flymake-xml-program): New option. === modified file 'lisp/progmodes/octave.el' --- lisp/progmodes/octave.el 2013-05-13 07:24:22 +0000 +++ lisp/progmodes/octave.el 2013-05-14 05:19:29 +0000 @@ -459,13 +459,14 @@ (let ((beg (match-beginning 0)) (end (match-end 0))) (unless (octave-in-string-or-comment-p) - (unwind-protect + (condition-case nil (progn (goto-char beg) (backward-up-list) (when (memq (char-after) '(?\( ?\[ ?\{)) - (put-text-property beg end 'face nil))) - (goto-char end))))) + (put-text-property beg end 'face nil)) + (goto-char end)) + (error (goto-char end)))))) nil)) ;; Fontify all operators. (cons octave-operator-regexp 'font-lock-builtin-face) @@ -929,9 +930,9 @@ (defun octave-goto-function-definition () "Go to the first function definition." - (when (save-excursion - (goto-char (point-min)) - (re-search-forward octave-function-header-regexp nil t)) + (goto-char (point-min)) + (if (not (re-search-forward octave-function-header-regexp nil t)) + (forward-comment (point-max)) (goto-char (match-beginning 3)) (match-string 3))) @@ -1681,9 +1682,10 @@ (user-error "%s" (or line (format "`%s' not found" fn))) (require 'etags) (ring-insert find-tag-marker-ring (point-marker)) - (find-file (funcall octave-find-definition-filename-function file)) - (or (octave-goto-function-definition) - (forward-comment (point-max)))))) + (setq file (funcall octave-find-definition-filename-function file)) + (when file + (find-file file) + (octave-goto-function-definition))))) (provide 'octave) ------------------------------------------------------------ revno: 112575 committer: Glenn Morris branch nick: trunk timestamp: Mon 2013-05-13 22:42:17 -0400 message: * lisp/progmodes/flymake.el (flymake-xml-program): New option. (flymake-xml-init): Use it. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2013-05-14 02:08:35 +0000 +++ lisp/ChangeLog 2013-05-14 02:42:17 +0000 @@ -1,5 +1,8 @@ 2013-05-14 Glenn Morris + * progmodes/flymake.el (flymake-xml-program): New option. + (flymake-xml-init): Use it. + * term/xterm.el: Provide a feature. * term/sup-mouse.el: Move to obsolete/. Provide a feature. === modified file 'lisp/progmodes/flymake.el' --- lisp/progmodes/flymake.el 2013-05-09 01:40:20 +0000 +++ lisp/progmodes/flymake.el 2013-05-14 02:42:17 +0000 @@ -257,6 +257,13 @@ :version "23.1" :group 'tools) +(defcustom flymake-xml-program + (if (executable-find "xmlstarlet") "xmlstarlet" "xml") + "Program to use for XML validation." + :type 'file + :group 'flymake + :version "24.4") + (defcustom flymake-allowed-file-name-masks '(("\\.\\(?:c\\(?:pp\\|xx\\|\\+\\+\\)?\\|CC\\)\\'" flymake-simple-make-init) ("\\.xml\\'" flymake-xml-init) @@ -1852,7 +1859,9 @@ ;;;; xml-specific init-cleanup routines (defun flymake-xml-init () - (list "xml" (list "val" (flymake-init-create-temp-buffer-copy 'flymake-create-temp-inplace)))) + (list flymake-xml-program + (list "val" (flymake-init-create-temp-buffer-copy + 'flymake-create-temp-inplace)))) (provide 'flymake) ------------------------------------------------------------ revno: 112574 committer: Glenn Morris branch nick: trunk timestamp: Mon 2013-05-13 22:12:19 -0400 message: More cus-test.el tweaks * admin/cus-test.el (cus-test-get-lisp-files): Ignore obsolete/. (cus-test-libs): Fix let-binding of default-directory. (cus-test-noloads): Load all libs for the comparison. diff: === modified file 'admin/ChangeLog' --- admin/ChangeLog 2013-05-11 02:29:57 +0000 +++ admin/ChangeLog 2013-05-14 02:12:19 +0000 @@ -1,3 +1,9 @@ +2013-05-14 Glenn Morris + + * cus-test.el (cus-test-get-lisp-files): Ignore obsolete/. + (cus-test-libs): Fix let-binding of default-directory. + (cus-test-noloads): Load all libs for the comparison. + 2013-05-11 Glenn Morris * cus-test.el (cus-test-libs-noloads): Add a few more files. === modified file 'admin/cus-test.el' --- admin/cus-test.el 2013-05-11 02:29:57 +0000 +++ admin/cus-test.el 2013-05-14 02:12:19 +0000 @@ -30,11 +30,11 @@ ;; ;; The basic tests can be run in batch mode. Invoke them with ;; -;; src/emacs -batch -l admin/cus-test.el -f cus-test-opts +;; src/emacs -batch -l admin/cus-test.el -f cus-test-opts [all] ;; ;; src/emacs -batch -l admin/cus-test.el -f cus-test-deps ;; -;; src/emacs -batch -l admin/cus-test.el -f cus-test-libs +;; src/emacs -batch -l admin/cus-test.el -f cus-test-libs [all] ;; ;; src/emacs -batch -l admin/cus-test.el -f cus-test-noloads ;; @@ -314,7 +314,7 @@ (defun cus-test-get-lisp-files (&optional all) "Return list of all Lisp files with defcustoms. -Optional argument ALL non-nil means list all Lisp files." +Optional argument ALL non-nil means list all (non-obsolete) Lisp files." (let ((default-directory (expand-file-name "lisp/" source-directory)) (msg "Finding files...")) (message "%s" msg) @@ -322,8 +322,10 @@ ;; Hack to remove leading "./". (mapcar (lambda (e) (substring e 2)) (apply 'process-lines find-program + "-name" "obsolete" "-prune" "-o" "-name" "[^.]*.el" ; ignore .dir-locals.el - (unless all + (if all + '("-print") (list "-exec" grep-program "-l" "^[ \t]*(defcustom" "{}" "+")))) (message "%sdone" msg)))) @@ -448,11 +450,11 @@ command-line-args-left (setq more (pop command-line-args-left))) (cus-test-load-1 - (let ((default-directory source-directory) - (emacs (expand-file-name "src/emacs")) - skipped) + (let* ((default-directory source-directory) + (emacs (expand-file-name "src/emacs")) + skipped) (or (file-executable-p emacs) - (error "No Emacs executable in %ssrc" default-directory)) + (error "No such executable `%s'" emacs)) (mapc (lambda (file) (if (member file cus-test-libs-noloads) @@ -498,7 +500,7 @@ (cus-test-get-options "")) (message "Running %s" 'cus-test-load-libs) - (cus-test-load-libs) + (cus-test-load-libs "all") (setq cus-test-vars-not-cus-loaded (cus-test-get-options "")) ------------------------------------------------------------ revno: 112573 committer: Glenn Morris branch nick: trunk timestamp: Mon 2013-05-13 22:10:23 -0400 message: * ede/simple.el, semantic/java.el: Set generated-autoload-load-name. diff: === modified file 'lisp/cedet/ChangeLog' --- lisp/cedet/ChangeLog 2013-05-11 23:55:46 +0000 +++ lisp/cedet/ChangeLog 2013-05-14 02:10:23 +0000 @@ -1,3 +1,7 @@ +2013-05-14 Glenn Morris + + * ede/simple.el, semantic/java.el: Set generated-autoload-load-name. + 2013-05-11 Glenn Morris * ede/project-am.el, semantic/db-ebrowse.el, semantic/grammar.el: === modified file 'lisp/cedet/ede/simple.el' --- lisp/cedet/ede/simple.el 2013-01-01 09:11:05 +0000 +++ lisp/cedet/ede/simple.el 2013-05-14 02:10:23 +0000 @@ -118,4 +118,8 @@ (provide 'ede/simple) +;; Local variables: +;; generated-autoload-load-name: "ede/simple" +;; End: + ;;; ede/simple.el ends here === modified file 'lisp/cedet/semantic/java.el' --- lisp/cedet/semantic/java.el 2013-01-01 09:11:05 +0000 +++ lisp/cedet/semantic/java.el 2013-05-14 02:10:23 +0000 @@ -480,4 +480,8 @@ (provide 'semantic/java) +;; Local variables: +;; generated-autoload-load-name: "semantic/java" +;; End: + ;;; semantic/java.el ends here ------------------------------------------------------------ revno: 112572 committer: Glenn Morris branch nick: trunk timestamp: Mon 2013-05-13 22:08:35 -0400 message: * lisp/term/xterm.el: Provide a feature. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2013-05-14 02:04:02 +0000 +++ lisp/ChangeLog 2013-05-14 02:08:35 +0000 @@ -1,6 +1,8 @@ 2013-05-14 Glenn Morris - * term/sup-mouse.el: Move to obsolete/. + * term/xterm.el: Provide a feature. + + * term/sup-mouse.el: Move to obsolete/. Provide a feature. 2013-05-13 Glenn Morris === modified file 'lisp/term/xterm.el' --- lisp/term/xterm.el 2013-03-11 14:08:44 +0000 +++ lisp/term/xterm.el 2013-05-14 02:08:35 +0000 @@ -752,4 +752,6 @@ (set-terminal-parameter nil 'background-mode 'dark) t)) +(provide 'xterm) + ;;; xterm.el ends here ------------------------------------------------------------ revno: 112571 committer: Glenn Morris branch nick: trunk timestamp: Mon 2013-05-13 22:04:02 -0400 message: Make sup-mouse.el obsolete * doc/emacs/ack.texi (Acknowledgments): Don't mention obsolete sup-mouse.el. * term/sup-mouse.el: Move to obsolete/. * etc/NEWS: Mention this. diff: === modified file 'doc/emacs/ChangeLog' --- doc/emacs/ChangeLog 2013-05-09 02:44:12 +0000 +++ doc/emacs/ChangeLog 2013-05-14 02:04:02 +0000 @@ -1,3 +1,7 @@ +2013-05-14 Glenn Morris + + * ack.texi (Acknowledgments): Don't mention obsolete sup-mouse.el. + 2013-05-09 Glenn Morris * sending.texi (Mail Sending): Fix typo. === modified file 'doc/emacs/ack.texi' --- doc/emacs/ack.texi 2013-03-17 22:55:13 +0000 +++ doc/emacs/ack.texi 2013-05-14 02:04:02 +0000 @@ -1058,8 +1058,7 @@ @item Wolfgang Rupprecht wrote Emacs 19's floating-point support (including -@file{float-sup.el} and @file{floatfns.c}), and @file{sup-mouse.el}, -support for the Supdup mouse on lisp machines. +@file{float-sup.el} and @file{floatfns.c}). @item Kevin Ryde wrote @file{info-xref.el}, a library for checking === modified file 'etc/NEWS' --- etc/NEWS 2013-05-07 21:34:03 +0000 +++ etc/NEWS 2013-05-14 02:04:02 +0000 @@ -298,6 +298,9 @@ *** longlines.el is obsolete; use visual-line-mode instead. ++++ +*** sup-mouse.el. + *** terminal.el is obsolete; use term.el instead. +++ === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2013-05-13 16:21:00 +0000 +++ lisp/ChangeLog 2013-05-14 02:04:02 +0000 @@ -1,3 +1,7 @@ +2013-05-14 Glenn Morris + + * term/sup-mouse.el: Move to obsolete/. + 2013-05-13 Glenn Morris * cus-dep.el (defcustom-mh, defgroup-mh, defface-mh): === renamed file 'lisp/term/sup-mouse.el' => 'lisp/obsolete/sup-mouse.el' --- lisp/term/sup-mouse.el 2013-01-01 09:11:05 +0000 +++ lisp/obsolete/sup-mouse.el 2013-05-14 02:04:02 +0000 @@ -6,6 +6,7 @@ ;; Maintainer: FSF ;; Created: 21 Nov 1986 ;; Keywords: hardware +;; Obsolete-since: 24.4 ;; (from code originally written by John Robinson@bbn for the bitgraph) @@ -197,4 +198,6 @@ (get-window-with-predicate (lambda (w) (coordinates-in-window-p (cons x y) w)))) +(provide 'sup-mouse) + ;;; sup-mouse.el ends here ------------------------------------------------------------ revno: 112570 committer: Glenn Morris branch nick: trunk timestamp: Mon 2013-05-13 13:52:59 -0400 message: Fix typo in previous diff: === modified file 'lisp/cedet/ede/project-am.el' --- lisp/cedet/ede/project-am.el 2013-05-11 23:55:46 +0000 +++ lisp/cedet/ede/project-am.el 2013-05-13 17:52:59 +0000 @@ -55,7 +55,7 @@ (defcustom project-am-compile-project-command nil "*Default command used to compile a project." :group 'project-am - :type '(choice const nil) string) + :type '(choice (const nil) string)) (defcustom project-am-compile-target-command (concat ede-make-command " -k %s") "*Default command used to compile a project." ------------------------------------------------------------ revno: 112569 fixes bug: http://debbugs.gnu.org/14384 committer: Glenn Morris branch nick: trunk timestamp: Mon 2013-05-13 09:21:00 -0700 message: * cus-dep.el (defcustom-mh, defgroup-mh, defface-mh): Add compat aliases as a hack workaround. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2013-05-13 07:24:22 +0000 +++ lisp/ChangeLog 2013-05-13 16:21:00 +0000 @@ -1,3 +1,8 @@ +2013-05-13 Glenn Morris + + * cus-dep.el (defcustom-mh, defgroup-mh, defface-mh): + Add compat aliases as a hack workaround. (Bug#14384) + 2013-05-13 Leo Liu * progmodes/octave.el (octave-indent-comment): Fix indentation for === modified file 'lisp/cus-dep.el' --- lisp/cus-dep.el 2013-05-11 23:54:14 +0000 +++ lisp/cus-dep.el 2013-05-13 16:21:00 +0000 @@ -38,6 +38,18 @@ (require 'autoload) +;; Hack workaround for bug#14384. +;; Define defcustom-mh as an alias for defcustom, etc. +;; Only do this in batch mode to avoid messing up a normal Emacs session. +;; Alternative would be to load mh-e when making cus-load. +;; (Would be better to split just the necessary parts of mh-e into a +;; separate file and only load that.) +(when (and noninteractive) + (mapc (lambda (e) (let ((sym (intern (format "%s-mh" e)))) + (or (fboundp sym) + (defalias sym e)))) + '(defcustom defface defgroup))) + (defun custom-make-dependencies () "Batch function to extract custom dependencies from .el files. Usage: emacs -batch -l ./cus-dep.el -f custom-make-dependencies DIRS" @@ -82,6 +94,7 @@ (let ((expr (read (current-buffer)))) (condition-case nil (let ((custom-dont-initialize t)) + ;; Why do we need to eval just for the name? (eval expr) (put (nth 1 expr) 'custom-where name)) (error nil)))) ------------------------------------------------------------ revno: 112568 committer: Glenn Morris branch nick: trunk timestamp: Mon 2013-05-13 06:17:36 -0400 message: Auto-commit of generated files. diff: === modified file 'autogen/configure' --- autogen/configure 2013-05-10 10:17:36 +0000 +++ autogen/configure 2013-05-13 10:17:36 +0000 @@ -8535,7 +8535,7 @@ ;; openbsd) - ## Han Boetes says this is necessary, + ## Han Boetes says this is necessary, ## otherwise Emacs dumps core on elf systems. LD_SWITCH_SYSTEM="-Z" ;; @@ -27741,6 +27741,8 @@ ## It seems clearer therefore to put this piece in LD_SWITCH_SYSTEM_TEMACS. gnu*) LD_SWITCH_SYSTEM_TEMACS="\$(LD_SWITCH_X_SITE_RPATH)" ;; + openbsd) LD_SWITCH_SYSTEM_TEMACS='-nopie' ;; + *) LD_SWITCH_SYSTEM_TEMACS= ;; esac ------------------------------------------------------------ revno: 112567 committer: Leo Liu branch nick: trunk timestamp: Mon 2013-05-13 15:24:22 +0800 message: * progmodes/octave.el (octave-indent-comment): Fix indentation for %!. (octave-comment-start-skip): Include %!. (octave-mode): Set comment-start-skip to octave-comment-start-skip. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2013-05-13 01:36:42 +0000 +++ lisp/ChangeLog 2013-05-13 07:24:22 +0000 @@ -1,9 +1,11 @@ 2013-05-13 Leo Liu - * progmodes/octave.el (octave-indent-comment): Fix the indentation - of ### or %%%. + * progmodes/octave.el (octave-indent-comment): Fix indentation for + ###, and %!. (octave-mode-map): Bind octave-indent-defun to C-c C-q instead of C-M-q. + (octave-comment-start-skip): Include %!. + (octave-mode): Set comment-start-skip to octave-comment-start-skip. 2013-05-12 Leo Liu === modified file 'lisp/progmodes/octave.el' --- lisp/progmodes/octave.el 2013-05-13 01:36:42 +0000 +++ lisp/progmodes/octave.el 2013-05-13 07:24:22 +0000 @@ -64,7 +64,7 @@ (string octave-comment-char ?\s) "String to insert to start a new Octave in-line comment.") -(defvar octave-comment-start-skip "\\s<+\\s-*" +(defvar octave-comment-start-skip "\\(?:%!\\|\\s<+\\)\\s-*" "Regexp to match the start of an Octave comment up to its body.") (defvar octave-begin-keywords @@ -439,7 +439,8 @@ ((octave-in-string-or-comment-p) nil) ((looking-at-p "\\s<\\{3,\\}") 0) - ((and (looking-at-p "\\s<\\(?:[^{}]\\|$\\)") + ;; Exclude %{, %} and %!. + ((and (looking-at-p "\\s<\\(?:[^{}!]\\|$\\)") (not (looking-at-p "\\s<\\s<"))) (comment-choose-indent))))) @@ -532,10 +533,7 @@ (setq-local comment-start octave-comment-start) (setq-local comment-end "") - ;; Don't set it here: it's not really a property of the language, - ;; just a personal preference of the author. - ;; (setq-local comment-column 32) - (setq-local comment-start-skip "\\s<+\\s-*") + (setq-local comment-start-skip octave-comment-start-skip) (setq-local comment-add 1) (setq-local parse-sexp-ignore-comments t) ------------------------------------------------------------ revno: 112566 committer: Paul Eggert branch nick: trunk timestamp: Sun 2013-05-12 23:23:08 -0700 message: * configure.ac (LD_SWITCH_SYSTEM_EMACS): Fix typo in previous change. diff: === modified file 'ChangeLog' --- ChangeLog 2013-05-13 03:54:34 +0000 +++ ChangeLog 2013-05-13 06:23:08 +0000 @@ -1,6 +1,6 @@ 2013-05-13 Paul Eggert - * configure.ac (LD_SWITCH_SYSTEM_TEMACS): OpenBSD needs -fno-pie. + * configure.ac (LD_SWITCH_SYSTEM_TEMACS): OpenBSD needs -nopie. Reported privately by Han Boetes . 2013-05-08 Juanma Barranquero === modified file 'configure.ac' --- configure.ac 2013-05-13 03:54:34 +0000 +++ configure.ac 2013-05-13 06:23:08 +0000 @@ -1009,7 +1009,7 @@ ;; openbsd) - ## Han Boetes says this is necessary, + ## Han Boetes says this is necessary, ## otherwise Emacs dumps core on elf systems. LD_SWITCH_SYSTEM="-Z" ;; @@ -4273,7 +4273,7 @@ ## It seems clearer therefore to put this piece in LD_SWITCH_SYSTEM_TEMACS. gnu*) LD_SWITCH_SYSTEM_TEMACS="\$(LD_SWITCH_X_SITE_RPATH)" ;; - openbsd) LD_SWITCH_SYSTEM_TEMACS='-fno-pie' ;; + openbsd) LD_SWITCH_SYSTEM_TEMACS='-nopie' ;; *) LD_SWITCH_SYSTEM_TEMACS= ;; esac