------------------------------------------------------------ revno: 116220 author: Lars Ingebrigtsen committer: Katsumi Yamaoka branch nick: trunk timestamp: Fri 2014-01-31 08:33:13 +0000 message: lisp/gnus/nnimap.el (nnimap-transform-headers): Fix Davmail header parsing diff: === modified file 'lisp/gnus/ChangeLog' --- lisp/gnus/ChangeLog 2014-01-31 01:56:00 +0000 +++ lisp/gnus/ChangeLog 2014-01-31 08:33:13 +0000 @@ -1,3 +1,7 @@ +2014-01-31 Lars Ingebrigtsen + + * nnimap.el (nnimap-transform-headers): Fix Davmail header parsing. + 2014-01-31 Dave Abrahams * gnus-salt.el (gnus-tree-highlight-article): Don't move point around === modified file 'lisp/gnus/nnimap.el' --- lisp/gnus/nnimap.el 2014-01-01 07:43:34 +0000 +++ lisp/gnus/nnimap.el 2014-01-31 08:33:13 +0000 @@ -216,7 +216,7 @@ ;; Start of the header section. (or (re-search-forward "] {[0-9]+}\r?\n" nil t) ;; Start of the next FETCH. - (re-search-forward "\\* [0-9]+ FETCH" nil t) + (re-search-forward "\\* [0-9]+ \\(UID \\)? FETCH" nil t) (point-max))) t) (setq size (string-to-number (match-string 1))) @@ -255,7 +255,9 @@ (insert (format "Chars: %s\n" size))) (when lines (insert (format "Lines: %s\n" lines))) - (unless (re-search-forward "^\r$" nil t) + ;; Most servers have a blank line after the headers, but + ;; Davmail doesn't. + (unless (re-search-forward "^\r$\\|^)\r?$" nil t) (goto-char (point-max))) (delete-region (line-beginning-position) (line-end-position)) (insert ".") ------------------------------------------------------------ revno: 116219 committer: Glenn Morris branch nick: trunk timestamp: Thu 2014-01-30 23:28:17 -0800 message: Delete Selection mode doc updates * lisp/delsel.el (delete-selection-mode): Doc fix. * doc/misc/efaq.texi (Replacing highlighted text): Update delete-selection-mode doc. * etc/NEWS: Related edit. diff: === modified file 'doc/misc/ChangeLog' --- doc/misc/ChangeLog 2014-01-30 03:41:34 +0000 +++ doc/misc/ChangeLog 2014-01-31 07:28:17 +0000 @@ -1,3 +1,8 @@ +2014-01-31 Glenn Morris + + * efaq.texi (Replacing highlighted text): + Update delete-selection-mode doc. + 2014-01-30 Xue Fuqiao * sem-user.texi (Include paths): Fix a Texinfo command. === modified file 'doc/misc/efaq.texi' --- doc/misc/efaq.texi 2014-01-24 07:36:34 +0000 +++ doc/misc/efaq.texi 2014-01-31 07:28:17 +0000 @@ -1578,10 +1578,9 @@ delete-selection-mode @key{RET}}): @quotation -When Delete Selection mode is enabled, Transient Mark mode is also -enabled and typed text replaces the selection if the selection is -active. Otherwise, typed text is just inserted at point regardless of -any selection. +When Delete Selection mode is enabled, typed text replaces the selection +if the selection is active. Otherwise, typed text is just inserted at +point regardless of any selection. @end quotation This mode also allows you to delete (not kill) the highlighted region by === modified file 'etc/NEWS' --- etc/NEWS 2014-01-31 07:15:54 +0000 +++ etc/NEWS 2014-01-31 07:28:17 +0000 @@ -448,7 +448,8 @@ There is a fallback syntax available if you don't have cf-promises or if your version doesn't support that option. See option `cfengine-cf-promises'. -** Delete Selection mode can now be used without `transient-mark-mode'. +--- +** Delete Selection mode can now be used without Transient Mark mode. ** Desktop === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2014-01-31 07:15:54 +0000 +++ lisp/ChangeLog 2014-01-31 07:28:17 +0000 @@ -1,5 +1,7 @@ 2014-01-31 Glenn Morris + * delsel.el (delete-selection-mode): Doc fix. + * emacs-lisp/trace.el (trace--read-args, trace-function-foreground) (trace-function-background): Doc fixes. === modified file 'lisp/delsel.el' --- lisp/delsel.el 2014-01-05 02:56:08 +0000 +++ lisp/delsel.el 2014-01-31 07:28:17 +0000 @@ -64,10 +64,9 @@ is positive, and disable it otherwise. If called from Lisp, enable the mode if ARG is omitted or nil. -When Delete Selection mode is enabled, Transient Mark mode is also -enabled and typed text replaces the selection if the selection is -active. Otherwise, typed text is just inserted at point regardless of -any selection." +When Delete Selection mode is enabled, typed text replaces the selection +if the selection is active. Otherwise, typed text is just inserted at +point regardless of any selection." :global t :group 'editing-basics (if (not delete-selection-mode) (remove-hook 'pre-command-hook 'delete-selection-pre-hook) ------------------------------------------------------------ revno: 116218 committer: Glenn Morris branch nick: trunk timestamp: Thu 2014-01-30 23:15:54 -0800 message: trace.el doc updates * lisp/emacs-lisp/trace.el (trace--read-args, trace-function-foreground) (trace-function-background): Doc fixes. Commentary update for this package now using nadvice.el, not advice.el. * etc/NEWS: Related edits. diff: === modified file 'etc/NEWS' --- etc/NEWS 2014-01-31 06:39:51 +0000 +++ etc/NEWS 2014-01-31 07:15:54 +0000 @@ -813,14 +813,18 @@ *** Extensive customizability of operation and display, including many faces. -** trace-function - -*** No prompting for the destination buffer, unless a prefix argument is used. - -*** With a prefix argument, you can enter a "context"; i.e., a Lisp -expression whose value at the time the function is entered/exited will -be printed along with the function name and arguments. For example, -you can use this to trace the value of current-buffer or point. +** Trace + +--- +*** `trace-function' and `trace-function-background' no longer prompt for +the output buffer. Unless you use a prefix argument, they output to +`trace-buffer'. + +--- +*** With a prefix argument, `trace-function' and `trace-function-background' +will prompt for a "context". This is a Lisp expression, whose value at the +time the function is entered/exited is printed along with the function's +name and arguments. ** Tramp === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2014-01-31 06:34:44 +0000 +++ lisp/ChangeLog 2014-01-31 07:15:54 +0000 @@ -1,5 +1,8 @@ 2014-01-31 Glenn Morris + * emacs-lisp/trace.el (trace--read-args, trace-function-foreground) + (trace-function-background): Doc fixes. + * ido.el (ido-use-virtual-buffers): Doc fix. Reset :version, since the default value has not changed. === modified file 'lisp/emacs-lisp/trace.el' --- lisp/emacs-lisp/trace.el 2014-01-01 07:43:34 +0000 +++ lisp/emacs-lisp/trace.el 2014-01-31 07:15:54 +0000 @@ -32,9 +32,9 @@ ;; Introduction: ;; ============= -;; A simple trace package that utilizes advice.el. It generates trace +;; A simple trace package that utilizes nadvice.el. It generates trace ;; information in a Lisp-style fashion and inserts it into a trace output -;; buffer. Tracing can be done in the background (or silently) so that +;; buffer. Tracing can be done in the background (or silently) so that ;; generation of trace output won't interfere with what you are currently ;; doing. @@ -48,15 +48,14 @@ ;; + Compiled calls to subrs that have special byte-codes associated ;; with them (e.g., car, cdr, ...) ;; + Macros that were expanded during compilation -;; - All the restrictions that apply to advice.el +;; - All the restrictions that apply to nadvice.el ;; Usage: ;; ====== -;; - To trace a function say `M-x trace-function' which will ask you for the -;; name of the function/subr/macro to trace, as well as for the buffer -;; into which trace output should go. +;; - To trace a function say `M-x trace-function', which will ask you for the +;; name of the function/subr/macro to trace. ;; - If you want to trace a function that switches buffers or does other -;; display oriented stuff use `M-x trace-function-background' which will +;; display oriented stuff use `M-x trace-function-background', which will ;; generate the trace output silently in the background without popping ;; up windows and doing other irritating stuff. ;; - To untrace a function say `M-x untrace-function'. @@ -262,6 +261,9 @@ (advice-member-p trace-advice-name function)) (defun trace--read-args (prompt) + "Read a function name, prompting with string PROMPT. +If `current-prefix-arg' is non-nil, also read a buffer and a \"context\" +\(Lisp expression). Return (FUNCTION BUFFER FUNCTION-CONTEXT)." (cons (let ((default (function-called-at-point)) (beg (string-match ":[ \t]*\\'" prompt))) @@ -288,23 +290,30 @@ ;;;###autoload (defun trace-function-foreground (function &optional buffer context) - "Traces FUNCTION with trace output going to BUFFER. -For every call of FUNCTION Lisp-style trace messages that display argument -and return values will be inserted into BUFFER. This function generates the -trace advice for FUNCTION and activates it together with any other advice -there might be!! The trace BUFFER will popup whenever FUNCTION is called. -Do not use this to trace functions that switch buffers or do any other -display oriented stuff, use `trace-function-background' instead. - -To untrace a function, use `untrace-function' or `untrace-all'." + "Trace calls to function FUNCTION. +With a prefix argument, also prompt for the trace buffer (default +`trace-buffer'), and a Lisp expression CONTEXT. + +Tracing a function causes every call to that function to insert +into BUFFER Lisp-style trace messages that display the function's +arguments and return values. It also evaluates CONTEXT, if that is +non-nil, and inserts its value too. For example, you can use this +to track the current buffer, or position of point. + +This function creates BUFFER if it does not exist. This buffer will +popup whenever FUNCTION is called. Do not use this function to trace +functions that switch buffers, or do any other display-oriented +stuff - use `trace-function-background' instead. + +To stop tracing a function, use `untrace-function' or `untrace-all'." (interactive (trace--read-args "Trace function: ")) (trace-function-internal function buffer nil context)) ;;;###autoload (defun trace-function-background (function &optional buffer context) - "Traces FUNCTION with trace output going quietly to BUFFER. -Like `trace-function-foreground' but without popping up the trace BUFFER or -changing the window configuration." + "Trace calls to function FUNCTION, quietly. +This is like `trace-function-foreground', but without popping up +the output buffer or changing the window configuration." (interactive (trace--read-args "Trace function in background: ")) (trace-function-internal function buffer t context)) ------------------------------------------------------------ revno: 116217 committer: Glenn Morris branch nick: trunk timestamp: Thu 2014-01-30 22:39:51 -0800 message: * lisp/erc/erc.el (erc-accidental-paste-threshold-seconds): Doc tweak. * etc/NEWS: Related markup. diff: === modified file 'etc/NEWS' --- etc/NEWS 2014-01-31 06:34:44 +0000 +++ etc/NEWS 2014-01-31 06:39:51 +0000 @@ -512,6 +512,7 @@ is `foo@bar.com', ignore that name as regards encryption. This is useful to avoid a query when you have no key for that name. +--- ** New ERC option `erc-accidental-paste-threshold-seconds'. If set to a number, this can be used to avoid accidentally pasting large amounts of data into the ERC input. === modified file 'lisp/erc/ChangeLog' --- lisp/erc/ChangeLog 2014-01-25 19:15:42 +0000 +++ lisp/erc/ChangeLog 2014-01-31 06:39:51 +0000 @@ -1,3 +1,7 @@ +2014-01-31 Glenn Morris + + * erc.el (erc-accidental-paste-threshold-seconds): Doc tweak. + 2014-01-25 Rüdiger Sonderfeld * erc.el (erc): Link to info manual. === modified file 'lisp/erc/erc.el' --- lisp/erc/erc.el 2014-01-25 19:15:42 +0000 +++ lisp/erc/erc.el 2014-01-31 06:39:51 +0000 @@ -5190,11 +5190,10 @@ (defcustom erc-accidental-paste-threshold-seconds nil "Minimum time, in seconds, before sending new lines via IRC. -If the value is a number, `erc-send-current-line' signals an -error if its previous invocation was less than this much time -ago. This is useful so that if you accidentally enter large -amounts of text into the ERC buffer, that text is not sent to the -IRC server. +If the value is a number, `erc-send-current-line' signals an error +if its previous invocation was fewer than this many seconds ago. +This is useful so that if you accidentally enter large amounts of text +into the ERC buffer, that text is not sent to the IRC server. If the value is nil, `erc-send-current-line' always considers any submitted line to be intentional." ------------------------------------------------------------ revno: 116216 committer: Glenn Morris branch nick: trunk timestamp: Thu 2014-01-30 22:34:44 -0800 message: * lisp/ido.el (ido-use-virtual-buffers): Doc fix. Reset :version, since the default value has not changed. * etc/NEWS: Related edits. diff: === modified file 'etc/NEWS' --- etc/NEWS 2014-01-31 06:20:29 +0000 +++ etc/NEWS 2014-01-31 06:34:44 +0000 @@ -558,11 +558,17 @@ ** Ido -*** Ido has a manual now. - -*** `ido-use-virtual-buffers' takes a new value 'auto. - -*** `ido-decorations' has been slightly extended to give a bit more control. ++++ +*** An Ido user manual is now included. + +--- +*** The option `ido-use-virtual-buffers' can now take the value `auto'. +This means to use virtual buffers if the current ido input does not match +an existing buffer. + +--- +*** The variable `ido-decorations' can optionally have two new elements, +which are the brackets to use around the sole remaining completion. ** Image mode === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2014-01-31 06:20:29 +0000 +++ lisp/ChangeLog 2014-01-31 06:34:44 +0000 @@ -1,5 +1,8 @@ 2014-01-31 Glenn Morris + * ido.el (ido-use-virtual-buffers): Doc fix. + Reset :version, since the default value has not changed. + * register.el (register-preview-delay, register-read-with-preview): Doc fixes. === modified file 'lisp/ido.el' --- lisp/ido.el 2014-01-27 02:02:28 +0000 +++ lisp/ido.el 2014-01-31 06:34:44 +0000 @@ -795,13 +795,11 @@ :group 'ido) (defcustom ido-use-virtual-buffers nil - "Specify how virtual buffers should be used. -The value can be one of the following: - - nil: No virtual buffers are used. - auto: Use virtual buffers when the current input matches no - existing buffers. + "If non-nil, refer to past (\"virtual\") buffers as well as existing ones. +The options are: + nil: Do not use virtual buffers. t: Always use virtual buffers. + auto: Use virtual buffers if the current input matches no existing buffer. Essentially it works as follows: Say you are visiting a file and the buffer gets cleaned up by midnight.el. Later, you want to @@ -811,10 +809,11 @@ it, it opens the file back up again. This allows you to think less about whether recently opened files are still open or not. Most of the time you can quit Emacs, restart, and then switch to -a file buffer that was previously open as if it still were. This -feature relies upon the `recentf' package, which will be enabled -if this variable is configured to a non-nil value." - :version "24.4" +a file buffer that was previously open as if it still were. + +This feature relies upon the `recentf' package, which will be +enabled if this variable is configured to a non-nil value." + :version "24.1" :type '(choice (const :tag "Always" t) (const :tag "Automatic" auto) (const :tag "Never" nil)) ------------------------------------------------------------ revno: 116215 committer: Glenn Morris branch nick: trunk timestamp: Thu 2014-01-30 22:20:29 -0800 message: Some doc related to register-preview * lisp/register.el (register-preview-delay, register-read-with-preview): Doc fixes. * etc/NEWS: Related edits. diff: === modified file 'etc/NEWS' --- etc/NEWS 2014-01-30 07:54:28 +0000 +++ etc/NEWS 2014-01-31 06:20:29 +0000 @@ -301,7 +301,9 @@ ** Register changes -*** All register commands can now show help with preview. +*** All interactive commands that read a register (`copy-to-register', etc.) +now display a temporary window after `register-preview-delay' seconds +that summarizes existing registers. To disable this, set that option to nil. +++ *** New command `C-x C-k x' (`kmacro-to-register') stores keyboard === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2014-01-31 02:43:03 +0000 +++ lisp/ChangeLog 2014-01-31 06:20:29 +0000 @@ -1,5 +1,8 @@ 2014-01-31 Glenn Morris + * register.el (register-preview-delay, register-read-with-preview): + Doc fixes. + * mail/reporter.el (reporter-dump-variable): In case of void-variable, do not mess with mail-buffer position (fixes 2009-11-03 change). * progmodes/cc-mode.el (c-submit-bug-report): === modified file 'lisp/register.el' --- lisp/register.el 2014-01-01 07:43:34 +0000 +++ lisp/register.el 2014-01-31 06:20:29 +0000 @@ -90,9 +90,11 @@ (character :tag "Use register" :value ?+))) (defcustom register-preview-delay 1 - "If non-nil delay in seconds to pop up the preview window." + "If non-nil, time to wait in seconds before popping up a preview window. +If nil, do not show register previews, unless `help-char' (or a member of +`help-event-list') is pressed." :version "24.4" - :type '(choice number (const :tag "Indefinitely" nil)) + :type '(choice number (const :tag "No preview unless requested" nil)) :group 'register) (defun get-register (register) @@ -140,10 +142,11 @@ register-alist))))) (defun register-read-with-preview (prompt) - "Read an event with register preview using PROMPT. -Pop up a register preview window if the input is a help char but -is not a register. Alternatively if `register-preview-delay' is a -number the preview window is popped up after some delay." + "Read and return an event, prompting with PROMPT, possibly showing a preview. +If `register-alist' and `register-preview-delay' are both non-nil, +display a window listing registers after `register-preview-delay' seconds. +If `help-char' (or a member of `help-event-list') is pressed, display +such a window regardless." (let* ((buffer "*Register Preview*") (timer (when (numberp register-preview-delay) (run-with-timer register-preview-delay nil ------------------------------------------------------------ revno: 116214 committer: Glenn Morris branch nick: trunk timestamp: Thu 2014-01-30 21:43:03 -0500 message: ChangeLog fixes diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2014-01-31 02:39:40 +0000 +++ lisp/ChangeLog 2014-01-31 02:43:03 +0000 @@ -4347,7 +4347,7 @@ 2013-10-08 Bastien Guerry - * register.el (insert-register): Fix revno:114543. + * register.el (insert-register): Fix 2013-10-07 change. 2013-10-08 Stefan Monnier === modified file 'src/ChangeLog' --- src/ChangeLog 2014-01-30 17:22:30 +0000 +++ src/ChangeLog 2014-01-31 02:43:03 +0000 @@ -18,15 +18,12 @@ 2014-01-27 K. Handa - Fix bug#16286 by the different way than revno:116158 to preserve - the code detection behavior of 24.3. - + Fix bug#16286 by a different method from revno:116158 (2014-01-26), + to preserve the code detection behavior of 24.3. * coding.h (struct coding_system): New member detected_utf8_bytes. - * coding.c (detect_coding_utf_8): Set coding->detected_utf8_bytes. (decode_coding_gap): Use short cut for UTF-8 file reading only when coding->detected_utf8_bytes equals to coding->src_bytes. - * fileio.c (Finsert_file_contents): Cancel the previous change. 2014-01-29 Martin Rudalics ------------------------------------------------------------ revno: 116213 fixes bug: http://debbugs.gnu.org/16592 committer: Glenn Morris branch nick: trunk timestamp: Thu 2014-01-30 21:39:40 -0500 message: Fix for c-submit-bug-report and reporter.el void-variable handling * lisp/mail/reporter.el (reporter-dump-variable): In case of void-variable, do not mess with mail-buffer position (fixes 2009-11-03 change). * lisp/progmodes/cc-mode.el (c-submit-bug-report): Check auto-fill-mode is bound. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2014-01-31 01:58:51 +0000 +++ lisp/ChangeLog 2014-01-31 02:39:40 +0000 @@ -1,3 +1,10 @@ +2014-01-31 Glenn Morris + + * mail/reporter.el (reporter-dump-variable): In case of void-variable, + do not mess with mail-buffer position (fixes 2009-11-03 change). + * progmodes/cc-mode.el (c-submit-bug-report): + Check auto-fill-mode is bound. (Bug#16592) + 2014-01-31 Darren Hoo * startup.el (fancy-splash-image-file): New function, === modified file 'lisp/mail/reporter.el' --- lisp/mail/reporter.el 2014-01-01 07:43:34 +0000 +++ lisp/mail/reporter.el 2014-01-31 02:39:40 +0000 @@ -200,9 +200,10 @@ (insert "\n")) (void-variable (with-current-buffer mailbuf - (mail-position-on-field "X-Reporter-Void-Vars-Found") - (end-of-line) - (insert (symbol-name varsym) " "))) + (save-excursion + (mail-position-on-field "X-Reporter-Void-Vars-Found") + (end-of-line) + (insert (symbol-name varsym) " ")))) (error (error "")))) === modified file 'lisp/progmodes/cc-mode.el' --- lisp/progmodes/cc-mode.el 2014-01-19 12:32:47 +0000 +++ lisp/progmodes/cc-mode.el 2014-01-31 02:39:40 +0000 @@ -1733,6 +1733,7 @@ filladapt-mode defun-prompt-regexp font-lock-mode + auto-fill-mode font-lock-maximum-decoration parse-sexp-lookup-properties lookup-syntax-properties)) ------------------------------------------------------------ revno: 116212 fixes bug: http://debbugs.gnu.org/16574 author: Darren Hoo committer: Glenn Morris branch nick: trunk timestamp: Thu 2014-01-30 20:58:51 -0500 message: Fix for fancy-splash image inconsistency * lisp/startup.el (fancy-splash-image-file): New function, split from fancy-splash-head. (fancy-splash-head, use-fancy-splash-screens-p): Use it, so that we are both using the same image. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2014-01-30 17:42:48 +0000 +++ lisp/ChangeLog 2014-01-31 01:58:51 +0000 @@ -1,3 +1,10 @@ +2014-01-31 Darren Hoo + + * startup.el (fancy-splash-image-file): New function, + split from fancy-splash-head. + (fancy-splash-head, use-fancy-splash-screens-p): Use it, + so that we are both using the same image. (Bug#16574) + 2014-01-30 Glenn Morris * simple.el (eval-expression): Doc fix. === modified file 'lisp/startup.el' --- lisp/startup.el 2014-01-01 07:43:34 +0000 +++ lisp/startup.el 2014-01-31 01:58:51 +0000 @@ -1590,24 +1590,26 @@ (declare-function image-size "image.c" (spec &optional pixels frame)) +(defun fancy-splash-image-file () + (cond ((stringp fancy-splash-image) fancy-splash-image) + ((display-color-p) + (cond ((<= (display-planes) 8) + (if (image-type-available-p 'xpm) + "splash.xpm" + "splash.pbm")) + ((or (image-type-available-p 'svg) + (image-type-available-p 'imagemagick)) + "splash.svg") + ((image-type-available-p 'png) + "splash.png") + ((image-type-available-p 'xpm) + "splash.xpm") + (t "splash.pbm"))) + (t "splash.pbm"))) + (defun fancy-splash-head () "Insert the head part of the splash screen into the current buffer." - (let* ((image-file (cond ((stringp fancy-splash-image) - fancy-splash-image) - ((display-color-p) - (cond ((<= (display-planes) 8) - (if (image-type-available-p 'xpm) - "splash.xpm" - "splash.pbm")) - ((or (image-type-available-p 'svg) - (image-type-available-p 'imagemagick)) - "splash.svg") - ((image-type-available-p 'png) - "splash.png") - ((image-type-available-p 'xpm) - "splash.xpm") - (t "splash.pbm"))) - (t "splash.pbm"))) + (let* ((image-file (fancy-splash-image-file)) (img (create-image image-file)) (image-width (and img (car (image-size img)))) (window-width (window-width))) @@ -1811,10 +1813,7 @@ (image-type-available-p 'pbm))) (let ((frame (fancy-splash-frame))) (when frame - (let* ((img (create-image (or fancy-splash-image - (if (and (display-color-p) - (image-type-available-p 'xpm)) - "splash.xpm" "splash.pbm")))) + (let* ((img (create-image (fancy-splash-image-file))) (image-height (and img (cdr (image-size img nil frame)))) ;; We test frame-height so that, if the frame is split ;; by displaying a warning, that doesn't cause the normal ------------------------------------------------------------ revno: 116211 author: Gnus developers committer: Katsumi Yamaoka branch nick: trunk timestamp: Fri 2014-01-31 01:56:00 +0000 message: Misc bugfixes made in Gnus master 2014-01-31 Alex Schroeder (tiny change) * gnus-tut.txt (Message-ID): Typo fix (bug#15556). 2014-01-31 Dave Abrahams * gnus-salt.el (gnus-tree-highlight-article): Don't move point around in the summary buffer (bug#13769). 2014-01-31 Lars Ingebrigtsen * gnus-art.el (gnus-article-setup-buffer): Refresh the summary buffer name if we're using a single article buffer. Otherwise, it may point to a killed buffer (bug#13756). 2014-01-30 Lars Ingebrigtsen * nnmail.el (nnmail-split-it): Instead of redoing the search to restore the match data, just save and restore it explictly (bug#12375). * gnus-sum.el (gnus-summary-read-group-1): Initialize the spam code if that's needed. * spam.el (spam-initialize): Allow calling repeatedly, but only run the the code once (bug#9069). diff: === modified file 'etc/ChangeLog' --- etc/ChangeLog 2014-01-22 07:35:50 +0000 +++ etc/ChangeLog 2014-01-31 01:56:00 +0000 @@ -1,3 +1,7 @@ +2014-01-31 Alex Schroeder (tiny change) + + * gnus-tut.txt (Message-ID): Typo fix (bug#15556). + 2014-01-16 Fabrice Niessen * themes/leuven-theme.el: Updates. (Bug#16442) === modified file 'etc/gnus-tut.txt' --- etc/gnus-tut.txt 2014-01-01 07:43:34 +0000 +++ etc/gnus-tut.txt 2014-01-31 01:56:00 +0000 @@ -273,7 +273,7 @@ give me a precise overview of your Gnus and Emacs version numbers, along with a look at all Gnus variables you have changed. -Du not expect a reply back, but your bug should be fixed in the next +Do not expect a reply back, but your bug should be fixed in the next version. If the bug persists, please re-submit your bug report. When a bug occurs, I need a recipe for how to trigger the bug. You === modified file 'lisp/gnus/ChangeLog' --- lisp/gnus/ChangeLog 2014-01-18 20:46:53 +0000 +++ lisp/gnus/ChangeLog 2014-01-31 01:56:00 +0000 @@ -1,3 +1,25 @@ +2014-01-31 Dave Abrahams + + * gnus-salt.el (gnus-tree-highlight-article): Don't move point around + in the summary buffer (bug#13769). + +2014-01-31 Lars Ingebrigtsen + + * gnus-art.el (gnus-article-setup-buffer): Refresh the summary buffer + name if we're using a single article buffer. Otherwise, it may point + to a killed buffer (bug#13756). + +2014-01-30 Lars Ingebrigtsen + + * nnmail.el (nnmail-split-it): Instead of redoing the search to restore + the match data, just save and restore it explictly (bug#12375). + + * gnus-sum.el (gnus-summary-read-group-1): Initialize the spam code if + that's needed. + + * spam.el (spam-initialize): Allow calling repeatedly, but only run the + the code once (bug#9069). + 2014-01-18 Steinar Bang * gnus-setup.el (gnus-use-sendmail): We never use sendmail for mail === modified file 'lisp/gnus/gnus-art.el' --- lisp/gnus/gnus-art.el 2014-01-01 07:43:34 +0000 +++ lisp/gnus/gnus-art.el 2014-01-31 01:56:00 +0000 @@ -4549,20 +4549,22 @@ nil) (error "Action aborted")) t))) - (with-current-buffer name - (set (make-local-variable 'gnus-article-edit-mode) nil) - (gnus-article-stop-animations) - (when gnus-article-mime-handles - (mm-destroy-parts gnus-article-mime-handles) - (setq gnus-article-mime-handles nil)) - ;; Set it to nil in article-buffer! - (setq gnus-article-mime-handle-alist nil) - (buffer-disable-undo) - (setq buffer-read-only t) - (unless (derived-mode-p 'gnus-article-mode) - (gnus-article-mode)) - (setq truncate-lines gnus-article-truncate-lines) - (current-buffer)) + (let ((summary gnus-summary-buffer)) + (with-current-buffer name + (set (make-local-variable 'gnus-article-edit-mode) nil) + (gnus-article-stop-animations) + (when gnus-article-mime-handles + (mm-destroy-parts gnus-article-mime-handles) + (setq gnus-article-mime-handles nil)) + ;; Set it to nil in article-buffer! + (setq gnus-article-mime-handle-alist nil) + (buffer-disable-undo) + (setq buffer-read-only t) + (unless (derived-mode-p 'gnus-article-mode) + (gnus-article-mode)) + (set (make-local-variable 'gnus-summary-buffer) summary) + (setq truncate-lines gnus-article-truncate-lines) + (current-buffer))) (let ((summary gnus-summary-buffer)) (with-current-buffer (gnus-get-buffer-create name) (gnus-article-mode) === modified file 'lisp/gnus/gnus-salt.el' --- lisp/gnus/gnus-salt.el 2014-01-01 07:43:34 +0000 +++ lisp/gnus/gnus-salt.el 2014-01-31 01:56:00 +0000 @@ -879,12 +879,15 @@ (set-buffer buf)))) (defun gnus-tree-highlight-article (article face) - (with-current-buffer (gnus-get-tree-buffer) - (let (region) - (when (setq region (gnus-tree-article-region article)) - (gnus-put-text-property (car region) (cdr region) 'face face) - (set-window-point - (gnus-get-buffer-window (current-buffer) t) (cdr region)))))) + ;; The save-excursion here is apparently necessary because + ;; `set-window-point' somehow manages to alter the buffer position. + (save-excursion + (with-current-buffer (gnus-get-tree-buffer) + (let (region) + (when (setq region (gnus-tree-article-region article)) + (gnus-put-text-property (car region) (cdr region) 'face face) + (set-window-point + (gnus-get-buffer-window (current-buffer) t) (cdr region))))))) ;;; Allow redefinition of functions. (gnus-ems-redefine) === modified file 'lisp/gnus/gnus-sum.el' --- lisp/gnus/gnus-sum.el 2014-01-05 23:38:42 +0000 +++ lisp/gnus/gnus-sum.el 2014-01-31 01:56:00 +0000 @@ -4024,6 +4024,8 @@ ;; The group was successfully selected. (t (gnus-set-global-variables) + (when (boundp 'spam-install-hooks) + (spam-initialize)) ;; Save the active value in effect when the group was entered. (setq gnus-newsgroup-active (gnus-copy-sequence === modified file 'lisp/gnus/nnmail.el' --- lisp/gnus/nnmail.el 2014-01-08 19:16:10 +0000 +++ lisp/gnus/nnmail.el 2014-01-31 01:56:00 +0000 @@ -1430,12 +1430,14 @@ ;; Check the cache for the regexp for this split. ((setq cached-pair (assq split nnmail-split-cache)) (let (split-result + match-data (end-point (point-max)) (value (nth 1 split))) (if (symbolp value) (setq value (cdr (assq value nnmail-split-abbrev-alist)))) (while (and (goto-char end-point) (re-search-backward (cdr cached-pair) nil t)) + (setq match-data (match-data)) (when nnmail-split-tracing (push split nnmail-split-trace)) (let ((split-rest (cddr split)) @@ -1464,12 +1466,9 @@ (setq split-rest (cddr split-rest)))) (when split-rest (goto-char end) - (let ((value (nth 1 split))) - (if (symbolp value) - (setq value (cdr (assq value nnmail-split-abbrev-alist)))) - ;; Someone might want to do a \N sub on this match, so get the - ;; correct match positions. - (re-search-backward value start-of-value)) + ;; Someone might want to do a \N sub on this match, so + ;; restore the match data. + (set-match-data match-data) (dolist (sp (nnmail-split-it (car split-rest))) (unless (member sp split-result) (push sp split-result)))))) === modified file 'lisp/gnus/spam.el' --- lisp/gnus/spam.el 2014-01-01 07:43:34 +0000 +++ lisp/gnus/spam.el 2014-01-31 01:56:00 +0000 @@ -2903,25 +2903,27 @@ installed through `spam-necessary-extra-headers'." (interactive) - (dolist (var symbols) - (set var t)) - - (dolist (header (spam-necessary-extra-headers)) - (add-to-list 'nnmail-extra-headers header) - (add-to-list 'gnus-extra-headers header)) - - (setq spam-install-hooks t) - ;; TODO: How do we redo this every time the `spam' face is customized? - (push '((eq mark gnus-spam-mark) . spam) - gnus-summary-highlight) - ;; Add hooks for loading and saving the spam stats - (add-hook 'gnus-save-newsrc-hook 'spam-maybe-spam-stat-save) - (add-hook 'gnus-get-top-new-news-hook 'spam-maybe-spam-stat-load) - (add-hook 'gnus-startup-hook 'spam-maybe-spam-stat-load) - (add-hook 'gnus-summary-prepare-exit-hook 'spam-summary-prepare-exit) - (add-hook 'gnus-summary-prepare-hook 'spam-summary-prepare) - (add-hook 'gnus-get-new-news-hook 'spam-setup-widening) - (add-hook 'gnus-summary-prepared-hook 'spam-find-spam)) + (when spam-install-hooks + (dolist (var symbols) + (set var t)) + + (dolist (header (spam-necessary-extra-headers)) + (add-to-list 'nnmail-extra-headers header) + (add-to-list 'gnus-extra-headers header)) + + ;; TODO: How do we redo this every time the `spam' face is customized? + (push '((eq mark gnus-spam-mark) . spam) + gnus-summary-highlight) + ;; Add hooks for loading and saving the spam stats + (add-hook 'gnus-save-newsrc-hook 'spam-maybe-spam-stat-save) + (add-hook 'gnus-get-top-new-news-hook 'spam-maybe-spam-stat-load) + (add-hook 'gnus-startup-hook 'spam-maybe-spam-stat-load) + (add-hook 'gnus-summary-prepare-exit-hook 'spam-summary-prepare-exit) + (add-hook 'gnus-summary-prepare-hook 'spam-summary-prepare) + (add-hook 'gnus-get-new-news-hook 'spam-setup-widening) + (add-hook 'gnus-summary-prepared-hook 'spam-find-spam) + ;; Don't install things more than once. + (setq spam-install-hooks nil))) (defun spam-unload-hook () "Uninstall the spam.el hooks." @@ -2936,8 +2938,6 @@ (add-hook 'spam-unload-hook 'spam-unload-hook) -(when spam-install-hooks - (spam-initialize)) ;;}}} (provide 'spam) ------------------------------------------------------------ revno: 116210 committer: Eli Zaretskii branch nick: trunk timestamp: Thu 2014-01-30 19:42:48 +0200 message: Revert last commit in mouse.el. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2014-01-30 13:19:19 +0000 +++ lisp/ChangeLog 2014-01-30 17:42:48 +0000 @@ -1,9 +1,3 @@ -2014-01-30 Martin Rudalics - - * mouse.el (mouse-drag-line): When window-resize-pixelwise is - nil call adjust-window-trailing-edge with suitable arguments - (Bug#16594). - 2014-01-30 Glenn Morris * simple.el (eval-expression): Doc fix. === modified file 'lisp/mouse.el' --- lisp/mouse.el 2014-01-30 13:19:19 +0000 +++ lisp/mouse.el 2014-01-30 17:42:48 +0000 @@ -475,11 +475,8 @@ (nth 2 (window-pixel-edges window)) -1)) (unless (zerop growth) - (unless window-resize-pixelwise - (setq growth (min (/ growth (frame-char-width frame)) 1))) (setq dragged t) - (adjust-window-trailing-edge - window growth t window-resize-pixelwise))) + (adjust-window-trailing-edge window growth t t))) (draggable ;; Drag horizontal divider. (setq growth @@ -490,12 +487,9 @@ (- (+ (nth 3 (window-pixel-edges window)) height) (cddr position)))) (unless (zerop growth) - (unless window-resize-pixelwise - (setq growth (min (/ growth (frame-char-height frame)) 1))) (setq dragged t) (adjust-window-trailing-edge - window (if (eq line 'mode) growth (- growth)) nil - window-resize-pixelwise)))))) + window (if (eq line 'mode) growth (- growth)) nil t)))))) ;; Process the terminating event. (when (and (mouse-event-p event) on-link (not dragged) (mouse--remap-link-click-p start-event event)) ------------------------------------------------------------ revno: 116209 committer: Andreas Schwab branch nick: emacs timestamp: Thu 2014-01-30 18:22:30 +0100 message: Don't ignore SIGPROF in subprocesses * process.c (create_process): Reset SIGPROF handler in the child. * callproc.c (call_process): Likewise. diff: === modified file 'src/ChangeLog' --- src/ChangeLog 2014-01-29 18:39:11 +0000 +++ src/ChangeLog 2014-01-30 17:22:30 +0000 @@ -1,3 +1,8 @@ +2014-01-30 Andreas Schwab + + * process.c (create_process): Reset SIGPROF handler in the child. + * callproc.c (call_process): Likewise. + 2014-01-29 Paul Eggert * xmenu.c (create_and_show_popup_menu): Port comment to C89. === modified file 'src/callproc.c' --- src/callproc.c 2014-01-01 07:43:34 +0000 +++ src/callproc.c 2014-01-30 17:22:30 +0000 @@ -677,6 +677,10 @@ /* Emacs ignores SIGPIPE, but the child should not. */ signal (SIGPIPE, SIG_DFL); + /* Likewise for SIGPROF. */ +#ifdef SIGPROF + signal (SIGPROF, SIG_DFL); +#endif child_setup (filefd, fd_output, fd_error, new_argv, 0, current_dir); } === modified file 'src/process.c' --- src/process.c 2014-01-20 19:44:56 +0000 +++ src/process.c 2014-01-30 17:22:30 +0000 @@ -1841,6 +1841,9 @@ signal (SIGINT, SIG_DFL); signal (SIGQUIT, SIG_DFL); +#ifdef SIGPROF + signal (SIGPROF, SIG_DFL); +#endif /* Emacs ignores SIGPIPE, but the child should not. */ signal (SIGPIPE, SIG_DFL); ------------------------------------------------------------ revno: 116208 committer: martin rudalics branch nick: trunk timestamp: Thu 2014-01-30 14:19:19 +0100 message: In mouse-drag-line obey window-resize-pixelwise (Bug#16594). * mouse.el (mouse-drag-line): When window-resize-pixelwise is nil call adjust-window-trailing-edge with suitable arguments (Bug#16594). diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2014-01-30 07:48:06 +0000 +++ lisp/ChangeLog 2014-01-30 13:19:19 +0000 @@ -1,3 +1,9 @@ +2014-01-30 Martin Rudalics + + * mouse.el (mouse-drag-line): When window-resize-pixelwise is + nil call adjust-window-trailing-edge with suitable arguments + (Bug#16594). + 2014-01-30 Glenn Morris * simple.el (eval-expression): Doc fix. === modified file 'lisp/mouse.el' --- lisp/mouse.el 2014-01-01 07:43:34 +0000 +++ lisp/mouse.el 2014-01-30 13:19:19 +0000 @@ -475,8 +475,11 @@ (nth 2 (window-pixel-edges window)) -1)) (unless (zerop growth) + (unless window-resize-pixelwise + (setq growth (min (/ growth (frame-char-width frame)) 1))) (setq dragged t) - (adjust-window-trailing-edge window growth t t))) + (adjust-window-trailing-edge + window growth t window-resize-pixelwise))) (draggable ;; Drag horizontal divider. (setq growth @@ -487,9 +490,12 @@ (- (+ (nth 3 (window-pixel-edges window)) height) (cddr position)))) (unless (zerop growth) + (unless window-resize-pixelwise + (setq growth (min (/ growth (frame-char-height frame)) 1))) (setq dragged t) (adjust-window-trailing-edge - window (if (eq line 'mode) growth (- growth)) nil t)))))) + window (if (eq line 'mode) growth (- growth)) nil + window-resize-pixelwise)))))) ;; Process the terminating event. (when (and (mouse-event-p event) on-link (not dragged) (mouse--remap-link-click-p start-event event)) ------------------------------------------------------------ revno: 116207 committer: Glenn Morris branch nick: trunk timestamp: Thu 2014-01-30 06:19:16 -0500 message: Auto-commit of loaddefs files. diff: === modified file 'lisp/emacs-lisp/eieio.el' --- lisp/emacs-lisp/eieio.el 2014-01-10 17:13:10 +0000 +++ lisp/emacs-lisp/eieio.el 2014-01-30 11:19:16 +0000 @@ -927,7 +927,7 @@ ;;;*** -;;;### (autoloads nil "eieio-opt" "eieio-opt.el" "f03278724025221a0259ed48516286f3") +;;;### (autoloads nil "eieio-opt" "eieio-opt.el" "2be72f3dd71a50ab6e749c50e0353c62") ;;; Generated autoloads from eieio-opt.el (autoload 'eieio-browse "eieio-opt" "\ ------------------------------------------------------------ revno: 116206 committer: Glenn Morris branch nick: trunk timestamp: Wed 2014-01-29 23:54:28 -0800 message: * etc/NEWS: ElDoc related edit. * lisp/emacs-lisp/eldoc.el: Related commentary. diff: === modified file 'etc/NEWS' --- etc/NEWS 2014-01-30 07:48:06 +0000 +++ etc/NEWS 2014-01-30 07:54:28 +0000 @@ -462,7 +462,10 @@ ** New Dired minor mode `dired-hide-details-mode' toggles whether details, such as file ownership or permissions, are visible. -** Eldoc Mode works properly in the minibuffer. +--- +** You can enable ElDoc inside the `eval-expression' minibuffer with: + (add-hook 'eval-expression-minibuffer-setup-hook 'eldoc-mode) +The results display in the mode line. ** Electric Pair mode @@ -623,7 +626,7 @@ *** Completion in Octave file buffers. -*** Eldoc support. +*** ElDoc support. *** Jump to definition. === modified file 'lisp/emacs-lisp/eldoc.el' --- lisp/emacs-lisp/eldoc.el 2014-01-30 07:42:57 +0000 +++ lisp/emacs-lisp/eldoc.el 2014-01-30 07:54:28 +0000 @@ -39,6 +39,7 @@ ;; (add-hook 'emacs-lisp-mode-hook 'eldoc-mode) ;; (add-hook 'lisp-interaction-mode-hook 'eldoc-mode) ;; (add-hook 'ielm-mode-hook 'eldoc-mode) +;; (add-hook 'eval-expression-minibuffer-setup-hook 'eldoc-mode) ;; Major modes for other languages may use ElDoc by defining an ;; appropriate function as the buffer-local value of