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

[Glenn Morris]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Glenn Morris <gm>       09/01/24 03:35:53

Modified files:
        lisp           : ChangeLog 
        lisp/mail      : rmail.el 

Log message:
        (rmail-insert-inbox-text): Revert replacement of "popmail" by "pormail".

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/ChangeLog?cvsroot=emacs&r1=1.15163&r2=1.15164
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/mail/rmail.el?cvsroot=emacs&r1=1.465&r2=1.466

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/emacs/emacs/lisp/ChangeLog,v
retrieving revision 1.15163
retrieving revision 1.15164
diff -u -b -r1.15163 -r1.15164
--- ChangeLog   24 Jan 2009 02:27:04 -0000      1.15163
+++ ChangeLog   24 Jan 2009 03:35:50 -0000      1.15164
@@ -1,3 +1,11 @@
+2009-01-24  Glenn Morris  <address@hidden>
+
+       * mail/rmail.el (rmail-insert-inbox-text): Revert replacement of
+       "popmail" by "pormail".
+
+       * language/ethio-util.el (rmail-current-message, rmail-message-vector):
+       Remove unneeded declarations.
+
 2009-01-24  Jay Belanger  <address@hidden>
 
        * calc/calc-poly.el (calcFunc-apart): Improve test for

Index: mail/rmail.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/mail/rmail.el,v
retrieving revision 1.465
retrieving revision 1.466
diff -u -b -r1.465 -r1.466
--- mail/rmail.el       23 Jan 2009 22:33:43 -0000      1.465
+++ mail/rmail.el       24 Jan 2009 03:35:53 -0000      1.466
@@ -1785,18 +1785,18 @@
   (or (memq (file-locked-p buffer-file-name) '(nil t))
       (error "RMAIL file %s is locked"
             (file-name-nondirectory buffer-file-name)))
-  (let (file tofile delete-files movemail pormail got-password password)
+  (let (file tofile delete-files movemail popmail got-password password)
     (while files
       ;; Handle remote mailbox names specially; don't expand as filenames
       ;; in case the userid contains a directory separator.
       (setq file (car files))
       (let ((url-data (rmail-parse-url file)))
        (setq file (nth 0 url-data))
-       (setq pormail (nth 1 url-data))
+       (setq popmail (nth 1 url-data))
        (setq password (nth 2 url-data))
        (setq got-password (nth 3 url-data)))
 
-      (if pormail
+      (if popmail
          (setq renamep t)
        (setq file (file-truename
                    (substitute-in-file-name (expand-file-name file)))))
@@ -1817,13 +1817,13 @@
                     (expand-file-name buffer-file-name))))
       ;; Always use movemail to rename the file,
       ;; since there can be mailboxes in various directories.
-      (when (not pormail)
+      (when (not popmail)
        ;; On some systems, /usr/spool/mail/foo is a directory
        ;; and the actual inbox is /usr/spool/mail/foo/foo.
        (if (file-directory-p file)
            (setq file (expand-file-name (user-login-name)
                                         file))))
-      (cond (pormail
+      (cond (popmail
             (message "Getting mail from the remote server ..."))
            ((and (file-exists-p tofile)
                  (/= 0 (nth 7 (file-attributes tofile))))
@@ -1835,7 +1835,7 @@
       ;; rename or copy the file FILE to TOFILE if and as appropriate.
       (cond ((not renamep)
             (setq tofile file))
-           ((or (file-exists-p tofile) (and (not pormail)
+           ((or (file-exists-p tofile) (and (not popmail)
                                             (not (file-exists-p file))))
             nil)
            (t