Mercurial > emacs
changeset 88292:b77cb10ab1be
(rmail-summary-get-sender): Handle a nil value of
rmail-user-mail-address-regexp.
| author | Henrik Enberg <henrik.enberg@telia.com> |
|---|---|
| date | Wed, 25 Jan 2006 16:39:44 +0000 |
| parents | 9e7ed1bfee5d |
| children | 93ee62702af5 |
| files | lisp/mail/rmailsum.el |
| diffstat | 1 files changed, 11 insertions(+), 10 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/mail/rmailsum.el Wed Jan 25 16:39:22 2006 +0000 +++ b/lisp/mail/rmailsum.el Wed Jan 25 16:39:44 2006 +0000 @@ -300,15 +300,15 @@ ;;;###autoload (defcustom rmail-user-mail-address-regexp -(concat "^\\(" - (regexp-quote (user-login-name)) - "\\($\\|@\\)\\|" - (regexp-quote - (or user-mail-address - (concat (user-login-name) "@" - (or mail-host-address - (system-name))))) - "\\>\\)") + (concat "^\\(" + (regexp-quote (user-login-name)) + "\\($\\|@\\)\\|" + (regexp-quote + (or user-mail-address + (concat (user-login-name) "@" + (or mail-host-address + (system-name))))) + "\\>\\)") "*Regexp matching user mail addresses. If non-nil, this variable is used to identify the correspondent when receiving new mail. If it matches the address of the @@ -1482,7 +1482,8 @@ `user-mail-address', return the to-address instead." (let ((sender (rmail-desc-get-sender n))) (if (or (null sender) - (string-match rmail-user-mail-address-regexp sender)) + (and rmail-user-mail-address-regexp + (string-match rmail-user-mail-address-regexp sender))) ;; Either no sender known, or it's this user. (save-restriction (narrow-to-region (rmail-desc-get-start n)