unknown
1970-01-01 00:00:00 UTC
\(fn RECIPIENTS &optional PRIMARY-ONLY)" t nil)
(autoload 'rmail-summary-by-regexp "rmailsum" "\
Display a summary of all messages according to regexp REGEXP.
If the regular expression is found in the header of the message
\(including in the date and other lines, as well as the subject line),
Emacs will list the message in the summary.
\(fn REGEXP)" t nil)
(autoload 'rmail-summary-by-topic "rmailsum" "\
Display a summary of all messages with the given SUBJECT.
Normally checks just the Subject field of headers; but with prefix
argument WHOLE-MESSAGE is non-nil, looks in the whole message.
SUBJECT is a string of regexps separated by commas.
\(fn SUBJECT &optional WHOLE-MESSAGE)" t nil)
(autoload 'rmail-summary-by-senders "rmailsum" "\
Display a summary of all messages whose \"From\" field matches SENDERS.
SENDERS is a string of regexps separated by commas.
\(fn SENDERS)" t nil)
;;;***
;;;### (autoloads (unforward-rmail-message undigestify-rmail-message)
;;;;;; "undigest" "undigest.el" "a31a35802a2adbc51be42959c3043dbd")
;;; Generated autoloads from undigest.el
(autoload 'undigestify-rmail-message "undigest" "\
Break up a digest message into its constituent messages.
Leaves original message, deleted, before the undigestified messages.
\(fn)" t nil)
(autoload 'unforward-rmail-message "undigest" "\
Extract a forwarded message from the containing message.
This puts the forwarded message into a separate rmail message following
the containing message. This command is only useful when messages are
forwarded with `rmail-enable-mime-composing' set to nil.
\(fn)" t nil)
;;;***
;;; End of automatically extracted autoloads.
(provide 'rmail)
;;; rmail.el ends here
--100904022-1407222762=:31566
Content-Transfer-Encoding: quoted-printable
Content-Description:
Content-ID: <***@ulysses.gnu.org.ua>
Content-Type: text/x-diff; name="rmail.el-mu-urls.patch"
--- rmail.el.orig 2014-07-30 09:20:04.693258142 +0300
+++ rmail.el 2014-08-05 09:38:15.408999427 +0300
@@ -210,7 +210,7 @@ We do this by executing it with `--versi
(cond
((looking-at ".*movemail: invalid option")
'emacs) ;; Possibly...
- ((looking-at "movemail (GNU Mailutils .*)")
+ ((looking-at "movemail (GNU Mailutils)")
'mailutils)
(t
;; FIXME:
@@ -1828,13 +1828,16 @@ not be a new one). It returns non-nil i
(setq result (> new-messages 0))
result))))
+(defun rmail-remote-proto-p (proto)
+ (string-match "^\\(\\(imap\\|pop\\)s?\\)$" proto))
+
(defun rmail-parse-url (file)
- "Parse the supplied URL. Return (list MAILBOX-NAME REMOTE PASSWORD GOT-PASSWORD)
+ "Parse the supplied URL. Return (list MAILBOX-NAME PROTO PASSWORD GOT-PASSWORD)
WHERE MAILBOX-NAME is the name of the mailbox suitable as argument to the
-actual version of `movemail', REMOTE is non-nil if MAILBOX-NAME refers to
-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.
+actual version of `movemail', PROTO is the protocol (use rmail-remote-proto-p
+to see if it refers to 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.
"
(cond
((string-match "^\\([^:]+\\)://\\(\\([^:@]+\\)\\(:\\([^@]+\\)\\)?@\\)?.*" file)
@@ -1845,24 +1848,26 @@ is non-nil if the user has supplied the
(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)))
- (setq supplied-password (rmail-get-remote-password
- (string-equal proto "imap"))))
- ;; The password is embedded. Strip it out since movemail
- ;; does not really like it, in spite of the movemail spec.
- (setq file (concat proto "://" user "@" host)))
+ (if (rmail-remote-proto-p proto)
+ (if (not pass)
+ (when rmail-remote-password-required
+ (setq got-password (not (rmail-have-password)))
+ (setq supplied-password (rmail-get-remote-password
+ (string-match "imaps?" proto))))
+ ;; FIXME
+ ;; The password is embedded. Strip it out since movemail
+ ;; does not really like it, in spite of the movemail spec.
+ (setq file (concat proto "://" user "@" host))))
(if (rmail-movemail-variant-p 'emacs)
(if (string-equal proto "pop")
(list (concat "po:" user ":" host)
- t
+ proto
(or pass supplied-password)
got-password)
(error "Emacs movemail does not support %s protocol" proto))
(list file
- (or (string-equal proto "pop") (string-equal proto "imap"))
+ proto
(or supplied-password pass)
got-password))))
@@ -1930,18 +1935,18 @@ Value is the size of the newly read mail
(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 popmail got-password password)
+ (let (file tofile delete-files movemail proto 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 popmail (nth 1 url-data))
+ (setq proto (nth 1 url-data))
(setq password (nth 2 url-data))
(setq got-password (nth 3 url-data)))
- (if popmail
+ (if proto
(setq renamep t)
(setq file (file-truename
(substitute-in-file-name (expand-file-name file)))))
@@ -1962,14 +1967,16 @@ Value is the size of the newly read mail
(expand-file-name buffer-file-name))))
;; Always use movemail to rename the file,
;; since there can be mailboxes in various directories.
- (when (not popmail)
+ (when (not proto)
;; 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 (popmail
- (message "Getting mail from the remote server ..."))
+ (cond (proto
+ (message (if (rmail-remote-proto-p proto)
+ "Getting mail from the remote server ..."
+ (concat "Getting mail from " proto))))
((and (file-exists-p tofile)
(/= 0 (nth 7 (file-attributes tofile))))
(message "Getting mail from %s..." tofile))
@@ -1980,7 +1987,7 @@ Value is the size of the newly read mail
;; 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 popmail)
+ ((or (file-exists-p tofile) (and (not proto)
(not (file-exists-p file))))
nil)
(t
@@ -1989,7 +1996,8 @@ Value is the size of the newly read mail
(buffer-disable-undo errors)
(let ((args
(append
- (list (or rmail-movemail-program "movemail") nil errors nil)
+ (list (or rmail-movemail-program "movemail")
+ nil errors nil)
(if rmail-preserve-inbox
(list "-p")
nil)
@@ -2015,9 +2023,10 @@ Value is the size of the newly read mail
;; If we just read the password, most likely it is
;; wrong. Otherwise, see if there is a specific
;; reason to think that the problem is a wrong passwd.
- (if (or got-password
- (re-search-forward rmail-remote-password-error
- nil t))
+ (if (and (rmail-remote-proto-p proto)
+ (or got-password
+ (re-search-forward rmail-remote-password-error
+ nil t)))
(rmail-set-remote-password nil))
;; If using Mailutils, remove initial error code
--100904022-1407222762=:31566--
(autoload 'rmail-summary-by-regexp "rmailsum" "\
Display a summary of all messages according to regexp REGEXP.
If the regular expression is found in the header of the message
\(including in the date and other lines, as well as the subject line),
Emacs will list the message in the summary.
\(fn REGEXP)" t nil)
(autoload 'rmail-summary-by-topic "rmailsum" "\
Display a summary of all messages with the given SUBJECT.
Normally checks just the Subject field of headers; but with prefix
argument WHOLE-MESSAGE is non-nil, looks in the whole message.
SUBJECT is a string of regexps separated by commas.
\(fn SUBJECT &optional WHOLE-MESSAGE)" t nil)
(autoload 'rmail-summary-by-senders "rmailsum" "\
Display a summary of all messages whose \"From\" field matches SENDERS.
SENDERS is a string of regexps separated by commas.
\(fn SENDERS)" t nil)
;;;***
;;;### (autoloads (unforward-rmail-message undigestify-rmail-message)
;;;;;; "undigest" "undigest.el" "a31a35802a2adbc51be42959c3043dbd")
;;; Generated autoloads from undigest.el
(autoload 'undigestify-rmail-message "undigest" "\
Break up a digest message into its constituent messages.
Leaves original message, deleted, before the undigestified messages.
\(fn)" t nil)
(autoload 'unforward-rmail-message "undigest" "\
Extract a forwarded message from the containing message.
This puts the forwarded message into a separate rmail message following
the containing message. This command is only useful when messages are
forwarded with `rmail-enable-mime-composing' set to nil.
\(fn)" t nil)
;;;***
;;; End of automatically extracted autoloads.
(provide 'rmail)
;;; rmail.el ends here
--100904022-1407222762=:31566
Content-Transfer-Encoding: quoted-printable
Content-Description:
Content-ID: <***@ulysses.gnu.org.ua>
Content-Type: text/x-diff; name="rmail.el-mu-urls.patch"
--- rmail.el.orig 2014-07-30 09:20:04.693258142 +0300
+++ rmail.el 2014-08-05 09:38:15.408999427 +0300
@@ -210,7 +210,7 @@ We do this by executing it with `--versi
(cond
((looking-at ".*movemail: invalid option")
'emacs) ;; Possibly...
- ((looking-at "movemail (GNU Mailutils .*)")
+ ((looking-at "movemail (GNU Mailutils)")
'mailutils)
(t
;; FIXME:
@@ -1828,13 +1828,16 @@ not be a new one). It returns non-nil i
(setq result (> new-messages 0))
result))))
+(defun rmail-remote-proto-p (proto)
+ (string-match "^\\(\\(imap\\|pop\\)s?\\)$" proto))
+
(defun rmail-parse-url (file)
- "Parse the supplied URL. Return (list MAILBOX-NAME REMOTE PASSWORD GOT-PASSWORD)
+ "Parse the supplied URL. Return (list MAILBOX-NAME PROTO PASSWORD GOT-PASSWORD)
WHERE MAILBOX-NAME is the name of the mailbox suitable as argument to the
-actual version of `movemail', REMOTE is non-nil if MAILBOX-NAME refers to
-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.
+actual version of `movemail', PROTO is the protocol (use rmail-remote-proto-p
+to see if it refers to 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.
"
(cond
((string-match "^\\([^:]+\\)://\\(\\([^:@]+\\)\\(:\\([^@]+\\)\\)?@\\)?.*" file)
@@ -1845,24 +1848,26 @@ is non-nil if the user has supplied the
(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)))
- (setq supplied-password (rmail-get-remote-password
- (string-equal proto "imap"))))
- ;; The password is embedded. Strip it out since movemail
- ;; does not really like it, in spite of the movemail spec.
- (setq file (concat proto "://" user "@" host)))
+ (if (rmail-remote-proto-p proto)
+ (if (not pass)
+ (when rmail-remote-password-required
+ (setq got-password (not (rmail-have-password)))
+ (setq supplied-password (rmail-get-remote-password
+ (string-match "imaps?" proto))))
+ ;; FIXME
+ ;; The password is embedded. Strip it out since movemail
+ ;; does not really like it, in spite of the movemail spec.
+ (setq file (concat proto "://" user "@" host))))
(if (rmail-movemail-variant-p 'emacs)
(if (string-equal proto "pop")
(list (concat "po:" user ":" host)
- t
+ proto
(or pass supplied-password)
got-password)
(error "Emacs movemail does not support %s protocol" proto))
(list file
- (or (string-equal proto "pop") (string-equal proto "imap"))
+ proto
(or supplied-password pass)
got-password))))
@@ -1930,18 +1935,18 @@ Value is the size of the newly read mail
(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 popmail got-password password)
+ (let (file tofile delete-files movemail proto 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 popmail (nth 1 url-data))
+ (setq proto (nth 1 url-data))
(setq password (nth 2 url-data))
(setq got-password (nth 3 url-data)))
- (if popmail
+ (if proto
(setq renamep t)
(setq file (file-truename
(substitute-in-file-name (expand-file-name file)))))
@@ -1962,14 +1967,16 @@ Value is the size of the newly read mail
(expand-file-name buffer-file-name))))
;; Always use movemail to rename the file,
;; since there can be mailboxes in various directories.
- (when (not popmail)
+ (when (not proto)
;; 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 (popmail
- (message "Getting mail from the remote server ..."))
+ (cond (proto
+ (message (if (rmail-remote-proto-p proto)
+ "Getting mail from the remote server ..."
+ (concat "Getting mail from " proto))))
((and (file-exists-p tofile)
(/= 0 (nth 7 (file-attributes tofile))))
(message "Getting mail from %s..." tofile))
@@ -1980,7 +1987,7 @@ Value is the size of the newly read mail
;; 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 popmail)
+ ((or (file-exists-p tofile) (and (not proto)
(not (file-exists-p file))))
nil)
(t
@@ -1989,7 +1996,8 @@ Value is the size of the newly read mail
(buffer-disable-undo errors)
(let ((args
(append
- (list (or rmail-movemail-program "movemail") nil errors nil)
+ (list (or rmail-movemail-program "movemail")
+ nil errors nil)
(if rmail-preserve-inbox
(list "-p")
nil)
@@ -2015,9 +2023,10 @@ Value is the size of the newly read mail
;; If we just read the password, most likely it is
;; wrong. Otherwise, see if there is a specific
;; reason to think that the problem is a wrong passwd.
- (if (or got-password
- (re-search-forward rmail-remote-password-error
- nil t))
+ (if (and (rmail-remote-proto-p proto)
+ (or got-password
+ (re-search-forward rmail-remote-password-error
+ nil t)))
(rmail-set-remote-password nil))
;; If using Mailutils, remove initial error code
--100904022-1407222762=:31566--