Now on revision 105853. Conflicting tags: mh-e-doc-8.3 ------------------------------------------------------------ revno: 105853 committer: Glenn Morris branch nick: trunk timestamp: Tue 2011-09-20 06:18:55 -0400 message: Auto-commit of loaddefs files. diff: === modified file 'lisp/ps-print.el' --- lisp/ps-print.el 2011-05-23 17:57:17 +0000 +++ lisp/ps-print.el 2011-09-20 10:18:55 +0000 @@ -6658,7 +6658,7 @@ ;; But autoload them here to make the separation invisible. ;;;### (autoloads (ps-mule-end-job ps-mule-begin-job ps-mule-initialize -;;;;;; ps-multibyte-buffer) "ps-mule" "ps-mule.el" "179b43ee432338186dde9e8c4fe761af") +;;;;;; ps-multibyte-buffer) "ps-mule" "ps-mule.el" "cf055ee6ba398da614a675dc25bdb123") ;;; Generated autoloads from ps-mule.el (defvar ps-multibyte-buffer nil "\ ------------------------------------------------------------ revno: 105852 committer: Glenn Morris branch nick: trunk timestamp: Mon 2011-09-19 23:36:45 -0700 message: Tweak previous f90.el change. diff: === modified file 'lisp/progmodes/f90.el' --- lisp/progmodes/f90.el 2011-09-20 04:12:05 +0000 +++ lisp/progmodes/f90.el 2011-09-20 06:36:45 +0000 @@ -2012,14 +2012,15 @@ (defun f90-find-breakpoint () "From `fill-column', search backward for break-delimiter." + ;; Commented text more likely than commented code. (if (f90-in-comment) (re-search-backward "\\s-" (line-beginning-position)) - (re-search-backward f90-break-delimiters (line-beginning-position))) - (if (not f90-break-before-delimiters) - (forward-char (if (looking-at f90-no-break-re) 2 1)) - (backward-char) - (or (looking-at f90-no-break-re) - (forward-char)))) + (re-search-backward f90-break-delimiters (line-beginning-position)) + (if (not f90-break-before-delimiters) + (forward-char (if (looking-at f90-no-break-re) 2 1)) + (backward-char) + (or (looking-at f90-no-break-re) + (forward-char))))) (defun f90-do-auto-fill () "Break line if non-white characters beyond `fill-column'. ------------------------------------------------------------ revno: 105851 tags: mh-e-8.3 committer: Bill Wohler branch nick: trunk timestamp: Mon 2011-09-19 21:56:51 -0700 message: * mh-e.el (Version, mh-version): Update for release 8.3. diff: === modified file 'lisp/mh-e/ChangeLog' --- lisp/mh-e/ChangeLog 2011-09-20 04:56:09 +0000 +++ lisp/mh-e/ChangeLog 2011-09-20 04:56:51 +0000 @@ -1,3 +1,9 @@ +2011-09-20 Bill Wohler + + Release MH-E version 8.3. + + * mh-e.el (Version, mh-version): Update for release 8.3. + 2011-07-30 Bill Wohler * mh-show.el (mh-unvisit-file): Clarify language in yes-or-no-p === modified file 'lisp/mh-e/mh-e.el' --- lisp/mh-e/mh-e.el 2011-07-17 21:13:38 +0000 +++ lisp/mh-e/mh-e.el 2011-09-20 04:56:51 +0000 @@ -5,7 +5,7 @@ ;; Author: Bill Wohler ;; Maintainer: Bill Wohler -;; Version: 8.2.93 +;; Version: 8.3 ;; Keywords: mail ;; This file is part of GNU Emacs. @@ -127,7 +127,7 @@ ;; Try to keep variables local to a single file. Provide accessors if ;; variables are shared. Use this section as a last resort. -(defconst mh-version "8.2.93" "Version number of MH-E.") +(defconst mh-version "8.3" "Version number of MH-E.") ;; Variants ------------------------------------------------------------ revno: 105850 committer: Bill Wohler branch nick: trunk timestamp: Mon 2011-09-19 21:56:09 -0700 message: * mh-show.el (mh-unvisit-file): Clarify language in yes-or-no-p and error messages. diff: === modified file 'lisp/mh-e/ChangeLog' --- lisp/mh-e/ChangeLog 2011-07-17 21:13:38 +0000 +++ lisp/mh-e/ChangeLog 2011-09-20 04:56:09 +0000 @@ -1,3 +1,8 @@ +2011-07-30 Bill Wohler + + * mh-show.el (mh-unvisit-file): Clarify language in yes-or-no-p + and error messages. + 2011-07-17 Bill Wohler Release MH-E version 8.2.93. === modified file 'lisp/mh-e/mh-show.el' --- lisp/mh-e/mh-show.el 2011-07-04 00:35:48 +0000 +++ lisp/mh-e/mh-show.el 2011-09-20 04:56:09 +0000 @@ -319,9 +319,9 @@ "Separate current buffer from the message file it was visiting." (or (not (buffer-modified-p)) (null buffer-file-name) ;we've been here before - (yes-or-no-p (format "Message %s modified; flush changes? " + (yes-or-no-p (format "Message %s modified; discard changes? " (file-name-nondirectory buffer-file-name))) - (error "Flushing changes not confirmed")) + (error "Changes preserved")) (clear-visited-file-modtime) (unlock-buffer) (setq buffer-file-name nil)) ------------------------------------------------------------ revno: 105849 committer: Bill Wohler branch nick: trunk timestamp: Mon 2011-09-19 21:51:59 -0700 message: * NEWS, MH-E-NEWS: Update for MH-E release 8.3. diff: === modified file 'etc/ChangeLog' --- etc/ChangeLog 2011-09-13 01:55:46 +0000 +++ etc/ChangeLog 2011-09-20 04:51:59 +0000 @@ -1,3 +1,9 @@ +2011-09-20 Bill Wohler + + Release MH-E version 8.3. + + * NEWS, MH-E-NEWS: Update for MH-E release 8.3. + 2011-09-13 William Stevenson * themes/adwaita-theme.el: New file. === modified file 'etc/MH-E-NEWS' --- etc/MH-E-NEWS 2011-07-17 21:16:34 +0000 +++ etc/MH-E-NEWS 2011-09-20 04:51:59 +0000 @@ -3,33 +3,12 @@ Copyright (C) 2001-2011 Free Software Foundation, Inc. See the end of the file for license conditions. -* Changes in MH-E 8.2.93 - -Version 8.2.93 reverts back to using `switch-to-buffer' which the -Emacs developers decided was fine to call from programs after all. - -* Changes in MH-E 8.2.92 - -Version 8.2.92 actually corrects the error in the modeline glyph when -running XEmacs 21.5.31 in a terminal. - -* Changes in MH-E 8.2.91 - -Version 8.2.91 fixes the folder window problem that was introduced -in 8.2.90. It also fixes compilation warnings in XEmacs 21.5.31, as -well as an error when running XEmacs 21.5.31 in a terminal. - -Another implication of the VCS change is that users who download MH-E -from SourceForge and explicitly load MH-E will have to be change their -`load-path' to "/path/to/mh-e/emacs/trunk/lisp/mh-e" instead. Note the -addition of "trunk." - -* Changes in MH-E 8.2.90 +* Changes in MH-E 8.3 In 2010, the version control system (VCS) of Emacs was upgraded from CVS to Bazaar. In 2011, the MH-E team followed suit and upgraded the MH-E repository at SourceForge from CVS to Bazaar as well. The result -is version 8.2.90 of MH-E, which includes needed changes to the build +is version 8.3 of MH-E, which includes needed changes to the build scripts. Otherwise, this is a small release that includes mostly internal @@ -40,9 +19,17 @@ Also, RFC 2047-encoded Subject header fields in replies are now decoded. +It also fixes compilation warnings in XEmacs 21.5.31, as +well as an error when running XEmacs 21.5.31 in a terminal. + +Another implication of the VCS change is that users who download MH-E +from SourceForge and explicitly load MH-E will have to be change their +`load-path' to "/path/to/mh-e/emacs/trunk/lisp/mh-e" instead. Note the +addition of "trunk." + This version of MH-E is packaged with GNU Emacs 24.1 -** Bug Fixes in MH-E 8.2.90 +** Bug Fixes in MH-E 8.3 *** Make mh-showing a legitimate minor mode === modified file 'etc/NEWS' --- etc/NEWS 2011-09-17 21:28:17 +0000 +++ etc/NEWS 2011-09-20 04:51:59 +0000 @@ -654,7 +654,7 @@ ** The Landmark game is now invoked with `landmark', not `lm'. -** MH-E has been upgraded to MH-E version 8.2.93. +** MH-E has been upgraded to MH-E version 8.3. See MH-E-NEWS for details. ** Modula-2 mode provides auto-indentation. ------------------------------------------------------------ revno: 105848 fixes bug(s): http://debbugs.gnu.org/9553 author: Lawrence Mitchell committer: Glenn Morris branch nick: trunk timestamp: Mon 2011-09-19 21:12:05 -0700 message: Fixes for f90.el filling in comments (bug#9553) * lisp/progmodes/f90.el (f90-break-line): If breaking inside comment delete all whitespace around breakpoint. (f90-find-breakpoint): Only break at whitespace inside a comment. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2011-09-20 01:06:29 +0000 +++ lisp/ChangeLog 2011-09-20 04:12:05 +0000 @@ -1,3 +1,9 @@ +2011-09-20 Lawrence Mitchell + + * progmodes/f90.el (f90-break-line): If breaking inside comment delete + all whitespace around breakpoint. (Bug#9553) + (f90-find-breakpoint): Only break at whitespace inside a comment. + 2011-09-20 Stefan Monnier * minibuffer.el (completion-file-name-table): Keep track of errors. === modified file 'lisp/progmodes/f90.el' --- lisp/progmodes/f90.el 2011-06-26 01:37:36 +0000 +++ lisp/progmodes/f90.el 2011-09-20 04:12:05 +0000 @@ -2000,7 +2000,7 @@ (cond ((f90-in-string) (insert "&\n&")) ((f90-in-comment) - (delete-horizontal-space 'backwards) ; remove trailing whitespace + (delete-horizontal-space) ; remove trailing whitespace (insert "\n" (f90-get-present-comment-type))) (t (insert "&") (or no-update (f90-update-line)) @@ -2012,7 +2012,9 @@ (defun f90-find-breakpoint () "From `fill-column', search backward for break-delimiter." - (re-search-backward f90-break-delimiters (line-beginning-position)) + (if (f90-in-comment) + (re-search-backward "\\s-" (line-beginning-position)) + (re-search-backward f90-break-delimiters (line-beginning-position))) (if (not f90-break-before-delimiters) (forward-char (if (looking-at f90-no-break-re) 2 1)) (backward-char) ------------------------------------------------------------ revno: 105847 fixes bug(s): http://debbugs.gnu.org/cgi/bugreport.cgi?bug=9160 committer: Stefan Monnier branch nick: trunk timestamp: Mon 2011-09-19 21:06:29 -0400 message: * lisp/minibuffer.el (completion-file-name-table): Keep track of errors. (completion-table-with-predicate): Handle the case where pred1 is nil. * lisp/pcomplete.el (pcomplete-completions-at-point): Simplify. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2011-09-19 21:14:23 +0000 +++ lisp/ChangeLog 2011-09-20 01:06:29 +0000 @@ -1,3 +1,9 @@ +2011-09-20 Stefan Monnier + + * minibuffer.el (completion-file-name-table): Keep track of errors. + (completion-table-with-predicate): Handle the case where pred1 is nil. + * pcomplete.el (pcomplete-completions-at-point): Simplify. + 2011-09-19 Stefan Monnier * emacs-lisp/debug.el (debugger-args): Give it a docstring. === modified file 'lisp/minibuffer.el' --- lisp/minibuffer.el 2011-09-02 00:36:58 +0000 +++ lisp/minibuffer.el 2011-09-20 01:06:29 +0000 @@ -322,14 +322,15 @@ (test-completion string table pred2)) (t (or (complete-with-action action table string - (if (null pred2) pred1 + (if (not (and pred1 pred2)) + (or pred1 pred2) (lambda (x) ;; Call `pred1' first, so that `pred2' ;; really can't tell that `x' is in table. - (if (funcall pred1 x) (funcall pred2 x))))) + (and (funcall pred1 x) (funcall pred2 x))))) ;; If completion failed and we're not applying pred1 strictly, try ;; again without pred1. - (and (not strict) + (and (not strict) pred1 pred2 (complete-with-action action table string pred2)))))) (defun completion-table-in-turn (&rest tables) @@ -1774,7 +1775,7 @@ (defun completion-file-name-table (string pred action) "Completion table for file names." - (ignore-errors + (with-demoted-errors (cond ((eq action 'metadata) '(metadata (category . file))) ((eq (car-safe action) 'boundaries) === modified file 'lisp/pcomplete.el' --- lisp/pcomplete.el 2011-08-23 05:25:17 +0000 +++ lisp/pcomplete.el 2011-09-20 01:06:29 +0000 @@ -515,14 +515,13 @@ (pred ;; Pare it down, if applicable. (when (and pcomplete-use-paring pcomplete-seen) - (setq pcomplete-seen - (mapcar (lambda (f) - (funcall pcomplete-norm-func - (directory-file-name f))) - pcomplete-seen)) ;; Capture the dynbound values for later use. (let ((norm-func pcomplete-norm-func) - (seen pcomplete-seen)) + (seen + (mapcar (lambda (f) + (funcall pcomplete-norm-func + (directory-file-name f))) + pcomplete-seen))) (lambda (f) (not (member (funcall norm-func (directory-file-name f)) ------------------------------------------------------------ revno: 105846 committer: Katsumi Yamaoka branch nick: trunk timestamp: Tue 2011-09-20 00:21:58 +0000 message: gnus-fun.el (gnus-convert-image-to-x-face-command): Doc fix. diff: === modified file 'lisp/gnus/ChangeLog' --- lisp/gnus/ChangeLog 2011-09-19 22:06:57 +0000 +++ lisp/gnus/ChangeLog 2011-09-20 00:21:58 +0000 @@ -1,3 +1,7 @@ +2011-09-20 Katsumi Yamaoka + + * gnus-fun.el (gnus-convert-image-to-x-face-command): Doc fix. + 2011-09-18 Lars Magne Ingebrigtsen * mm-decode.el (mm-inline-media-tests): Fix typo in regexp. === modified file 'lisp/gnus/gnus-fun.el' --- lisp/gnus/gnus-fun.el 2011-06-30 03:01:09 +0000 +++ lisp/gnus/gnus-fun.el 2011-09-20 00:21:58 +0000 @@ -54,7 +54,7 @@ "convert -scale 48x48! %s xbm:- | xbm2xface.pl" "Command for converting an image to an X-Face. The command must take a image filename (use \"%s\") as input. -The output must be the X-Face header data on stdout in PNG format." +The output must be the X-Face header data on stdout." :version "22.1" :group 'gnus-fun :type '(choice (const :tag "giftopnm, netpbm (GIF input only)" ------------------------------------------------------------ revno: 105845 author: Gnus developers committer: Katsumi Yamaoka branch nick: trunk timestamp: Mon 2011-09-19 22:06:57 +0000 message: Merge changes made in Gnus trunk. mm-decode.el (mm-inline-media-tests): Fix typo in regexp. auth-source.el (auth-source-netrc-parse): Use an obfuscation method which work with things that are not ASCII. diff: === modified file 'lisp/gnus/ChangeLog' --- lisp/gnus/ChangeLog 2011-09-17 12:02:10 +0000 +++ lisp/gnus/ChangeLog 2011-09-19 22:06:57 +0000 @@ -1,3 +1,12 @@ +2011-09-18 Lars Magne Ingebrigtsen + + * mm-decode.el (mm-inline-media-tests): Fix typo in regexp. + +2011-09-19 Julien Danjou + + * auth-source.el (auth-source-netrc-parse): Use an obfuscation method + which work with things that are not ASCII. + 2011-09-17 Lars Magne Ingebrigtsen * mm-decode.el (mm-inline-media-tests): Support imagemagick images. === modified file 'lisp/gnus/auth-source.el' --- lisp/gnus/auth-source.el 2011-08-30 23:01:50 +0000 +++ lisp/gnus/auth-source.el 2011-09-19 22:06:57 +0000 @@ -886,11 +886,8 @@ ;; (note for the irony-impaired: they are just obfuscated) (aput 'auth-source-netrc-cache file (list :mtime (nth 5 (file-attributes file)) - :secret (lexical-let ((v (rot13-string - (base64-encode-string - (buffer-string))))) - (lambda () (base64-decode-string - (rot13-string v))))))) + :secret (lexical-let ((v (mapcar '1+ (buffer-string)))) + (lambda () (apply 'string (mapcar '1- v))))))) (goto-char (point-min)) ;; Go through the file, line by line. (while (and (not (eobp)) === modified file 'lisp/gnus/mm-decode.el' --- lisp/gnus/mm-decode.el 2011-09-17 12:02:10 +0000 +++ lisp/gnus/mm-decode.el 2011-09-19 22:06:57 +0000 @@ -265,7 +265,7 @@ ("multipart/alternative" ignore identity) ("multipart/mixed" ignore identity) ("multipart/related" ignore identity) - ("image/*" + ("image/.*" mm-inline-image (lambda (handle) (and (mm-valid-image-format-p 'imagemagick) ------------------------------------------------------------ revno: 105844 committer: Stefan Monnier branch nick: trunk timestamp: Mon 2011-09-19 17:14:23 -0400 message: * lisp/emacs-lisp/debug.el (debugger-args): Give it a docstring. (debugger-return-value): Signal an error if the debugging context does not await any return value. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2011-09-19 19:27:30 +0000 +++ lisp/ChangeLog 2011-09-19 21:14:23 +0000 @@ -1,5 +1,9 @@ 2011-09-19 Stefan Monnier + * emacs-lisp/debug.el (debugger-args): Give it a docstring. + (debugger-return-value): Signal an error if the debugging context does + not await any return value. + * ps-mule.el (ps-mule-plot-string): Don't inf-loop (bug#5108). * image-mode.el (image-toggle-display-text) (image-toggle-display-image): Stay away from evil `intangible'. === modified file 'lisp/emacs-lisp/debug.el' --- lisp/emacs-lisp/debug.el 2011-09-13 21:13:10 +0000 +++ lisp/emacs-lisp/debug.el 2011-09-19 21:14:23 +0000 @@ -98,6 +98,16 @@ (defvar inhibit-trace) ;Not yet implemented. +(defvar debugger-args nil + "Arguments with which the debugger was called. +It is a list expected to take the form (CAUSE . REST) +where CAUSE can be: +- debug: called for entry to a flagged function. +- t: called because of debug-on-next-call. +- lambda: same thing but via `funcall'. +- exit: called because of exit of a flagged function. +- error: called because of `debug-on-error'.") + ;;;###autoload (setq debugger 'debug) ;;;###autoload @@ -296,32 +306,33 @@ (insert "Debugger entered") ;; lambda is for debug-on-call when a function call is next. ;; debug is for debug-on-entry function called. - (cond ((memq (car debugger-args) '(lambda debug)) - (insert "--entering a function:\n")) - ;; Exiting a function. - ((eq (car debugger-args) 'exit) - (insert "--returning value: ") - (setq debugger-value (nth 1 debugger-args)) - (prin1 debugger-value (current-buffer)) - (insert ?\n) - (delete-char 1) - (insert ? ) - (beginning-of-line)) - ;; Debugger entered for an error. - ((eq (car debugger-args) 'error) - (insert "--Lisp error: ") - (prin1 (nth 1 debugger-args) (current-buffer)) - (insert ?\n)) - ;; debug-on-call, when the next thing is an eval. - ((eq (car debugger-args) t) - (insert "--beginning evaluation of function call form:\n")) - ;; User calls debug directly. - (t - (insert ": ") - (prin1 (if (eq (car debugger-args) 'nil) - (cdr debugger-args) debugger-args) - (current-buffer)) - (insert ?\n))) + (pcase (car debugger-args) + ((or `lambda `debug) + (insert "--entering a function:\n")) + ;; Exiting a function. + (`exit + (insert "--returning value: ") + (setq debugger-value (nth 1 debugger-args)) + (prin1 debugger-value (current-buffer)) + (insert ?\n) + (delete-char 1) + (insert ? ) + (beginning-of-line)) + ;; Debugger entered for an error. + (`error + (insert "--Lisp error: ") + (prin1 (nth 1 debugger-args) (current-buffer)) + (insert ?\n)) + ;; debug-on-call, when the next thing is an eval. + (`t + (insert "--beginning evaluation of function call form:\n")) + ;; User calls debug directly. + (_ + (insert ": ") + (prin1 (if (eq (car debugger-args) 'nil) + (cdr debugger-args) debugger-args) + (current-buffer)) + (insert ?\n))) ;; After any frame that uses eval-buffer, ;; insert a line that states the buffer position it's reading at. (save-excursion @@ -439,6 +450,10 @@ This is only useful when the value returned from the debugger will be used, such as in a debug on exit from a frame." (interactive "XReturn value (evaluated): ") + (when (memq (car debugger-args) '(t lambda error debug)) + (error "Cannot return a value %s" + (if (eq (car debugger-args) 'error) + "from an error" "at function entrance"))) (setq debugger-value val) (princ "Returning " t) (prin1 debugger-value) ------------------------------------------------------------ revno: 105843 fixes bug(s): http://debbugs.gnu.org/cgi/bugreport.cgi?bug=5108 committer: Stefan Monnier branch nick: trunk timestamp: Mon 2011-09-19 15:27:30 -0400 message: * lisp/ps-mule.el (ps-mule-plot-string): Don't inf-loop. * lisp/image-mode.el (image-toggle-display-text) (image-toggle-display-image): Stay away from evil `intangible'. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2011-09-19 18:57:55 +0000 +++ lisp/ChangeLog 2011-09-19 19:27:30 +0000 @@ -1,3 +1,9 @@ +2011-09-19 Stefan Monnier + + * ps-mule.el (ps-mule-plot-string): Don't inf-loop (bug#5108). + * image-mode.el (image-toggle-display-text) + (image-toggle-display-image): Stay away from evil `intangible'. + 2011-09-19 Leo Liu * replace.el (occur-revert-arguments): Make it permanent-local. === modified file 'lisp/image-mode.el' --- lisp/image-mode.el 2011-09-11 02:31:21 +0000 +++ lisp/image-mode.el 2011-09-19 19:27:30 +0000 @@ -465,7 +465,7 @@ (buffer-undo-list t) (modified (buffer-modified-p))) (remove-list-of-text-properties (point-min) (point-max) - '(display intangible read-nonsticky + '(display read-nonsticky ;; intangible read-only front-sticky)) (set-buffer-modified-p modified) (if (called-interactively-p 'any) @@ -506,8 +506,8 @@ (setq image (append image (image-transform-properties image))) (setq props `(display ,image - intangible ,image - rear-nonsticky (display intangible) + ;; intangible ,image + rear-nonsticky (display) ;; intangible read-only t front-sticky (read-only))) (let ((buffer-file-truename nil)) ; avoid changing dir mtime by lock_file === modified file 'lisp/ps-mule.el' --- lisp/ps-mule.el 2011-04-19 13:44:55 +0000 +++ lisp/ps-mule.el 2011-09-19 19:27:30 +0000 @@ -659,7 +659,7 @@ width) (goto-char from) (while (not endpos) - (cond ((= (point) stop) + (cond ((>= (point) stop) (if (= stop to) (setq endpos stop) (when (< from stop) ------------------------------------------------------------ revno: 105842 author: Leo Liu committer: Chong Yidong branch nick: trunk timestamp: Mon 2011-09-19 14:57:55 -0400 message: Fixes for Occur Edit mode. * replace.el (occur-revert-arguments): Make it permanent-local. (occur-mode): Don't call font-lock-defontify. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2011-09-19 18:45:55 +0000 +++ lisp/ChangeLog 2011-09-19 18:57:55 +0000 @@ -1,3 +1,8 @@ +2011-09-19 Leo Liu + + * replace.el (occur-revert-arguments): Make it permanent-local. + (occur-mode): Don't call font-lock-defontify. + 2011-09-19 Chong Yidong * net/ldap.el (ldap-search-internal): Don't push empty search === modified file 'lisp/replace.el' --- lisp/replace.el 2011-09-17 21:28:17 +0000 +++ lisp/replace.el 2011-09-19 18:57:55 +0000 @@ -826,6 +826,8 @@ (defvar occur-revert-arguments nil "Arguments to pass to `occur-1' to revert an Occur mode buffer. See `occur-revert-function'.") +(make-variable-buffer-local 'occur-revert-arguments) +(put 'occur-revert-arguments 'permanent-local t) (defcustom occur-mode-hook '(turn-on-font-lock) "Hook run when entering Occur mode." @@ -853,8 +855,6 @@ \\{occur-mode-map}" (set (make-local-variable 'revert-buffer-function) 'occur-revert-function) - (make-local-variable 'occur-revert-arguments) - (add-hook 'change-major-mode-hook 'font-lock-defontify nil t) (setq next-error-function 'occur-next-error)) @@ -876,7 +876,7 @@ In this mode, changes to the *Occur* buffer are also applied to the originating buffer. -To return to ordinary Occur mode, use \\[occur-mode]." +To return to ordinary Occur mode, use \\[occur-cease-edit]." (setq buffer-read-only nil) (add-hook 'after-change-functions 'occur-after-change-function nil t) (message (substitute-command-keys ------------------------------------------------------------ revno: 105841 committer: Chong Yidong branch nick: trunk timestamp: Mon 2011-09-19 14:45:55 -0400 message: Add missing ChangeLog entry for ldap.el change in r105812. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2011-09-19 18:06:14 +0000 +++ lisp/ChangeLog 2011-09-19 18:45:55 +0000 @@ -1,3 +1,8 @@ +2011-09-19 Chong Yidong + + * net/ldap.el (ldap-search-internal): Don't push empty search + result (Bug#9508). + 2011-09-19 Stefan Monnier * whitespace.el (whitespace-newline-mode): Disable it right (bug#9550). ------------------------------------------------------------ revno: 105840 fixes bug(s): http://debbugs.gnu.org/cgi/bugreport.cgi?bug=9550 committer: Stefan Monnier branch nick: trunk timestamp: Mon 2011-09-19 14:06:14 -0400 message: * lisp/whitespace.el (whitespace-newline-mode): Disable it right. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2011-09-19 06:53:45 +0000 +++ lisp/ChangeLog 2011-09-19 18:06:14 +0000 @@ -1,3 +1,7 @@ +2011-09-19 Stefan Monnier + + * whitespace.el (whitespace-newline-mode): Disable it right (bug#9550). + 2011-09-19 Michael Albinus * net/tramp-sh.el (tramp-inline-compress-commands): Add "xz". === modified file 'lisp/whitespace.el' --- lisp/whitespace.el 2011-05-04 01:02:09 +0000 +++ lisp/whitespace.el 2011-09-19 18:06:14 +0000 @@ -1105,8 +1105,8 @@ :global nil :group 'whitespace (let ((whitespace-style '(face newline-mark newline))) - (whitespace-mode whitespace-newline-mode) - ;; sync states (running a batch job) + (whitespace-mode (if whitespace-newline-mode 1 -1)) + ;; Sync states (running a batch job). (setq whitespace-newline-mode whitespace-mode))) ------------------------------------------------------------ revno: 105839 committer: Stefan Monnier branch nick: trunk timestamp: Mon 2011-09-19 12:48:36 -0400 message: org/org.el: Add FIXMEs for odd chunks of code diff: === modified file 'lisp/org/org.el' --- lisp/org/org.el 2011-09-17 12:19:04 +0000 +++ lisp/org/org.el 2011-09-19 16:48:36 +0000 @@ -7516,7 +7516,7 @@ (org-with-limited-levels (let* ((visp (not (outline-invisible-p))) (txt tree) - (^re_ (concat "\\(\\*+\\)[ \t]*")) + (^re_ (concat "\\(\\*+\\)[ \t]*")) ;FIXME: Why `concat'? (old-level (if (string-match org-outline-regexp-bol txt) (- (match-end 0) (match-beginning 0) 1) -1)) @@ -7534,7 +7534,7 @@ (condition-case nil (progn (outline-previous-visible-heading 1) - (if (looking-at re) + (if (looking-at re) ;FIXME: What's `re'? (- (match-end 0) (match-beginning 0) 1) 1)) (error 1)))) @@ -7543,7 +7543,7 @@ (progn (or (looking-at org-outline-regexp) (outline-next-visible-heading 1)) - (if (looking-at re) + (if (looking-at re) ;FIXME: What's `re'? (- (match-end 0) (match-beginning 0) 1) 1)) (error 1)))) ------------------------------------------------------------ revno: 105838 committer: Lars Magne Ingebrigtsen branch nick: trunk timestamp: Mon 2011-09-19 10:26:50 +0200 message: * .dir-locals.el: Change the debbugs regexp to allow having the bug number as the first thing on a line. diff: === modified file '.dir-locals.el' --- .dir-locals.el 2011-04-24 18:34:57 +0000 +++ .dir-locals.el 2011-09-19 08:26:50 +0000 @@ -5,7 +5,7 @@ ;; You must set bugtracker_debbugs_url in your bazaar.conf for this to work. ;; See admin/notes/bugtracker. (log-edit-mode . ((log-edit-rewrite-fixes - " (bug#\\([0-9]+\\))" . "debbugs:\\1"))) + "[ \n](bug#\\([0-9]+\\))" . "debbugs:\\1"))) (change-log-mode . ((add-log-time-zone-rule . t) (fill-column . 74) (bug-reference-url-format . "http://debbugs.gnu.org/%s") === modified file 'ChangeLog' --- ChangeLog 2011-09-15 03:01:25 +0000 +++ ChangeLog 2011-09-19 08:26:50 +0000 @@ -1,3 +1,8 @@ +2011-09-19 Lars Magne Ingebrigtsen + + * .dir-locals.el: Change the debbugs regexp to allow having the + bug number as the first thing on a line. + 2011-09-15 Glenn Morris * configure.in: Make configure work with recent GNUsteps.