mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2025-01-04 11:40:22 +00:00
Code Issues Releases Activity

(rmail-parse-url): Bugfix. Parse traditional mailbox specifications

Browse Source 
as well as URLs.
(rmail-insert-inbox-text): Remove unused conditional branches.
This commit is contained in:
Eli Zaretskii 2005-04-02 11:32:18 +00:00
parent 07778743cf
commit 2f2e237356
2 changed files with 26 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lisp/ChangeLog
View File

@ -1,3 +1,9 @@
2005-04-02 Sergey Poznyakoff <gray@Mirddin.farlep.net> (tiny change)
* mail/rmail.el (rmail-parse-url): Bugfix. Parse traditional
mailbox specifications as well as URLs.
(rmail-insert-inbox-text): Remove unused conditional branches.
2005-04-01 Jay Belanger <belanger@truman.edu>
* calc/calc-graph.el (calc-gnuplot-name, calc-gnuplot-plot-command)

49
lisp/mail/rmail.el
View File

@ -1622,13 +1622,15 @@ a remote mailbox, PASSWORD is the password if it should be
supplied as a separate argument to `movemail' or nil otherwise, GOT-PASSWORD
is non-nil if the user has supplied the password interactively.
"
(if (string-match "^\\([^:]+\\)://\\(\\([^:@]+\\)\\(:\\([^@]+\\)\\)?@\\)?.*" file)
(cond
((string-match "^\\([^:]+\\)://\\(\\([^:@]+\\)\\(:\\([^@]+\\)\\)?@\\)?.*" file)
(let (got-password supplied-password
(proto (match-string 1 file))
(user (match-string 3 file))
(pass (match-string 5 file))
(host (substring file (or (match-end 2)
(+ 3 (match-end 1))))))
(if (not pass)
(when rmail-remote-password-required
(setq got-password (not (rmail-have-password)))
@ -1645,8 +1647,22 @@ is non-nil if the user has supplied the password interactively.
(list file
(or (string-equal proto "pop") (string-equal proto "imap"))
supplied-password
got-password)))
(list file nil nil nil)))
got-password))))
((string-match "^po:\\([^:]+\\)\\(:\\(.*\\)\\)?" file)
(let (got-password supplied-password
(proto "pop")
(user (match-string 1 file))
(host (match-string 3 file)))
(when rmail-remote-password-required
(setq got-password (not (rmail-have-password)))
(setq supplied-password (rmail-get-remote-password nil)))
(list file "pop" supplied-password got-password)))
(t
(list file nil nil nil))))
(defun rmail-insert-inbox-text (files renamep)
;; Detect a locked file now, so that we avoid moving mail
@ -1686,15 +1702,7 @@ 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.
(setq movemail t)
;;; ;; If getting from mail spool directory,
;;; ;; use movemail to move rather than just renaming,
;;; ;; so as to interlock with the mailer.
;;; (setq movemail (string= file
;;; (file-truename
;;; (concat rmail-spool-directory
;;; (file-name-nondirectory file)))))
(if (and movemail (not popmail))
(if (not popmail)
(progn
;; On some systems, /usr/spool/mail/foo is a directory
;; and the actual inbox is /usr/spool/mail/foo/foo.
@ -1716,23 +1724,6 @@ is non-nil if the user has supplied the password interactively.
((or (file-exists-p tofile) (and (not popmail)
(not (file-exists-p file))))
nil)
((and (not movemail) (not popmail))
;; Try copying. If that fails (perhaps no space) and
;; we're allowed to blow away the inbox, rename instead.
(if rmail-preserve-inbox
(copy-file file tofile nil)
(condition-case nil
(copy-file file tofile nil)
(error
;; Third arg is t so we can replace existing file TOFILE.
(rename-file file tofile t))))
;; Make the real inbox file empty.
;; Leaving it deleted could cause lossage
;; because mailers often won't create the file.
(if (not rmail-preserve-inbox)
(condition-case ()
(write-region (point) (point) file)
(file-error nil))))
(t
(with-temp-buffer
(let ((errors (current-buffer)))