From mboxrd@z Thu Jan 1 00:00:00 1970 Path: main.gmane.org!not-for-mail From: Sergey Poznyakoff Newsgroups: gmane.emacs.devel Subject: rmail.el Date: Thu, 24 Feb 2005 17:20:47 +0200 Organization: Farlep-Internet Message-ID: <200502241520.j1OFKlo06750@Mirddin.farlep.net> NNTP-Posting-Host: main.gmane.org Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="1804289383-1109258286=:6743" X-Trace: sea.gmane.org 1109259983 13697 80.91.229.2 (24 Feb 2005 15:46:23 GMT) X-Complaints-To: usenet@sea.gmane.org NNTP-Posting-Date: Thu, 24 Feb 2005 15:46:23 +0000 (UTC) Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Thu Feb 24 16:46:23 2005 Original-Received: from lists.gnu.org ([199.232.76.165]) by ciao.gmane.org with esmtp (Exim 4.43) id 1D4LBr-0004pk-8a for ged-emacs-devel@m.gmane.org; Thu, 24 Feb 2005 16:46:11 +0100 Original-Received: from localhost ([127.0.0.1] helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1D4LTR-0001EY-0o for ged-emacs-devel@m.gmane.org; Thu, 24 Feb 2005 11:04:21 -0500 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1D4LNo-0005BJ-4H for emacs-devel@gnu.org; Thu, 24 Feb 2005 10:58:32 -0500 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1D4LNj-00058U-Hh for emacs-devel@gnu.org; Thu, 24 Feb 2005 10:58:30 -0500 Original-Received: from [199.232.76.173] (helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1D4LL4-0003iD-PR for emacs-devel@gnu.org; Thu, 24 Feb 2005 10:55:47 -0500 Original-Received: from [213.130.0.1] (helo=Mirddin.farlep.net) by monty-python.gnu.org with esmtp (Exim 4.34) id 1D4KnP-0005jj-Gi for emacs-devel@gnu.org; Thu, 24 Feb 2005 10:20:56 -0500 Original-Received: from Mirddin.farlep.net (localhost [127.0.0.1]) by Mirddin.farlep.net with ESMTP id j1OFKlo06750 for ; Thu, 24 Feb 2005 17:20:47 +0200 X-Mailutils-Message-Id: j1OFKlo06750 Original-To: emacs-devel@gnu.org X-Mailer: MH-E 7.4.2+cvs; GNU Mailutils 0.5; GNU Emacs 21.3.1 X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Original-Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org X-MailScanner-To: ged-emacs-devel@m.gmane.org Xref: main.gmane.org gmane.emacs.devel:33777 X-Report-Spam: http://spam.gmane.org/gmane.emacs.devel:33777 --1804289383-1109258286=:6743 Content-ID: <20050224171806.6743.1@Mirddin.farlep.net> Content-Type: text/plain Hello, Attached is the patch to rmail.el. ChangeLog entry: 2005-02-24 Sergey Poznyakoff * mail/rmail.el (rmail-parse-url): Bugfix. Parse traditional mailbox specifications as well as urls. (rmail-insert-inbox-text): Remove unused conditional branches Regards, Sergey --1804289383-1109258286=:6743 Content-transfer-encoding: quoted-printable Content-Description: Content-ID: <20050224171806.6743.1@Mirddin.farlep.net> Content-Type: text/x-patch; name="cvs-diff.log" Index: lisp/mail/rmail.el =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D RCS file: /cvsroot/emacs/emacs/lisp/mail/rmail.el,v retrieving revision 1.396 diff -p -u -r1.396 rmail.el --- lisp/mail/rmail.el 9 Feb 2005 15:50:37 -0000 1.396 +++ lisp/mail/rmail.el 24 Feb 2005 14:59:31 -0000 @@ -1620,13 +1620,15 @@ a remote mailbox, PASSWORD is the passwo supplied as a separate argument to `movemail' or nil otherwise, GOT-PASSWOR= D 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))) @@ -1643,8 +1645,22 @@ is non-nil if the user has supplied the = (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 @@ -1684,15 +1700,7 @@ is non-nil if the user has supplied the = (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=3D 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. @@ -1714,23 +1722,6 @@ is non-nil if the user has supplied the = ((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))) --1804289383-1109258286=:6743 Content-ID: <20050224171806.6743.2@Mirddin.farlep.net> Content-Type: text/plain --1804289383-1109258286=:6743 Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ Emacs-devel mailing list Emacs-devel@gnu.org http://lists.gnu.org/mailman/listinfo/emacs-devel --1804289383-1109258286=:6743--