diff options
| author | Glenn Morris <rgm@gnu.org> | 2009-01-24 03:35:50 +0000 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2009-01-24 03:35:50 +0000 |
| commit | 38291a39bc244b1acba9bf5b7fe40a54f4af6d40 (patch) | |
| tree | 9e8611338caf6d1b872bf5bebaf118003bb9f9d7 /lisp | |
| parent | 26ec94df156c77c031a6904c3720dec1dd9f0668 (diff) | |
| download | emacs-38291a39bc244b1acba9bf5b7fe40a54f4af6d40.tar.gz | |
(rmail-insert-inbox-text): Revert replacement of "popmail" by "pormail".
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/ChangeLog | 8 | ||||
| -rw-r--r-- | lisp/mail/rmail.el | 12 |
2 files changed, 14 insertions, 6 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 5550a2ceb83..301ee053d0f 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,11 @@ +2009-01-24 Glenn Morris <rgm@gnu.org> + + * 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 <jay.p.belanger@gmail.com> * calc/calc-poly.el (calcFunc-apart): Improve test for diff --git a/lisp/mail/rmail.el b/lisp/mail/rmail.el index 8930cc3bce9..87ca0d20ccf 100644 --- a/lisp/mail/rmail.el +++ b/lisp/mail/rmail.el @@ -1785,18 +1785,18 @@ is non-nil if the user has supplied the password interactively. (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 @@ is non-nil if the user has supplied the password interactively. (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 @@ is non-nil if the user has supplied the password interactively. ;; 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 |