diff options
Diffstat (limited to 'lisp/mail/rmail.el')
| -rw-r--r-- | lisp/mail/rmail.el | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/lisp/mail/rmail.el b/lisp/mail/rmail.el index e479a8e9b4a..9fbc9ba180f 100644 --- a/lisp/mail/rmail.el +++ b/lisp/mail/rmail.el @@ -207,8 +207,7 @@ or `-k' to enable Kerberos authentication." (defvar rmail-remote-password-error "invalid usercode or password\\| unknown user name or bad password\\|Authentication failed\\|MU_ERR_AUTH_FAILURE" - "Regular expression matching incorrect-password POP or IMAP server error -messages. + "Regexp matching incorrect-password POP or IMAP server error messages. If you get an incorrect-password error that this expression does not match, please report it with \\[report-emacs-bug].") @@ -1960,7 +1959,7 @@ Value is the size of the newly read mail after conversion." (file-name-nondirectory (if (memq system-type '(windows-nt cygwin ms-dos)) ;; cannot have colons in file name - (replace-regexp-in-string ":" "-" file) + (string-replace ":" "-" file) file))) ;; Use the directory of this rmail file ;; because it's a nuisance to use the homedir @@ -3374,7 +3373,7 @@ The idea is to match it against simplified subjects of other messages." ;; Hide commas so it will work ok if parsed as a comma-separated list ;; of regexps. (setq subject - (replace-regexp-in-string "," "\054" subject t t)) + (string-replace "," "\054" subject)) (concat "\\`" subject "\\'"))) (defun rmail-next-same-subject (n) @@ -4483,7 +4482,7 @@ TEXT and INDENT are not used." (defun rmail-get-remote-password (imap user host) "Get the password for retrieving mail from a POP or IMAP server. -If none has been set, the password is found via auth-source. If +If none has been set, the password is found via auth-source. If you use ~/.authinfo as your auth-source backend, then put something like the following in that file: |