[Emacs-diffs] emacs/lisp/mail rmail.el

[Glenn Morris]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Glenn Morris <gm>       09/02/24 03:31:40

Modified files:
        lisp/mail      : rmail.el 

Log message:
        (rmail): Don't show a message if rmail-get-new-mail already did.  
(Bug#2440)
        (rmail-quit): Don't swap buffers.  (Bug#2441)
        (rmail-list-to-menu): Don't globally bind `name'.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/mail/rmail.el?cvsroot=emacs&r1=1.512&r2=1.513

Patches:
Index: rmail.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/mail/rmail.el,v
retrieving revision 1.512
retrieving revision 1.513
diff -u -b -r1.512 -r1.513
--- rmail.el    20 Feb 2009 05:07:49 -0000      1.512
+++ rmail.el    24 Feb 2009 03:31:39 -0000      1.513
@@ -875,10 +875,11 @@
     (unwind-protect
        ;; Only get new mail when there is not a file name argument.
        (unless file-name-arg
-         (rmail-get-new-mail))
+         (setq msg-shown (rmail-get-new-mail)))
       (progn
        (set-buffer mail-buf)
-       (rmail-show-message (rmail-first-unseen-message))
+       (or msg-shown
+           (rmail-show-message (rmail-first-unseen-message)))
        (if rmail-display-summary (rmail-summary))
        (rmail-construct-io-menu)
        (if run-mail-hook
@@ -1419,7 +1420,6 @@
   (interactive)
   (set-buffer rmail-buffer)
   (rmail-expunge t)
-  (rmail-swap-buffers-maybe)
   (save-buffer)
   (when (boundp 'rmail-quit-hook)
     (run-hooks 'rmail-quit-hook))
@@ -1499,7 +1499,8 @@
        (sort files 'string<))))
 
 (defun rmail-list-to-menu (menu-name l action &optional full-name)
-  (let ((menu (make-sparse-keymap menu-name)))
+  (let ((menu (make-sparse-keymap menu-name))
+       name)
     (mapc
      (lambda (item)
        (let (command)
@@ -3226,6 +3227,8 @@
                                   replybuffer sendactions same-window others)
   (let (yank-action)
     (if replybuffer
+       ;; The function used here must behave like insert-buffer wrt
+       ;; point and mark (see doc of sc-cite-original).
        (setq yank-action (list 'insert-buffer replybuffer)))
     (setq others (cons (cons "cc" cc) others))
     (setq others (cons (cons "in-reply-to" in-reply-to) others))