aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEli Zaretskii2019-02-01 11:16:13 +0200
committerEli Zaretskii2019-02-01 11:16:13 +0200
commit7ba8f803983fce7896042289ca47b3de4df42bb7 (patch)
treef3680e0427e722c51d59657ba0e1f4ff81766ba7
parent9c8412a0b8e1f96b87ea506c3ec67778a4ce7bb4 (diff)
downloademacs-7ba8f803983fce7896042289ca47b3de4df42bb7.tar.gz
emacs-7ba8f803983fce7896042289ca47b3de4df42bb7.zip
Avoid errors in 'rmail-get-new-mail'
* lisp/mail/rmail.el (rmail-insert-inbox-text): Don't assume the Rmail protocol is always a string when calling 'rmail-remote-proto-p'. (Bug#34252)
-rw-r--r--lisp/mail/rmail.el3
1 files changed, 2 insertions, 1 deletions
diff --git a/lisp/mail/rmail.el b/lisp/mail/rmail.el
index 768454ab13b..8a75f1fba91 100644
--- a/lisp/mail/rmail.el
+++ b/lisp/mail/rmail.el
@@ -2079,7 +2079,8 @@ Value is the size of the newly read mail after conversion."
2079 ;; If we just read the password, most likely it is 2079 ;; If we just read the password, most likely it is
2080 ;; wrong. Otherwise, see if there is a specific 2080 ;; wrong. Otherwise, see if there is a specific
2081 ;; reason to think that the problem is a wrong passwd. 2081 ;; reason to think that the problem is a wrong passwd.
2082 (if (and (rmail-remote-proto-p proto) 2082 (if (and proto
2083 (rmail-remote-proto-p proto)
2083 (or got-password 2084 (or got-password
2084 (re-search-forward rmail-remote-password-error 2085 (re-search-forward rmail-remote-password-error
2085 nil t))) 2086 nil t)))