diff options
author | Alan Mackenzie <acm@muc.de> | 2019-03-30 17:25:53 +0000 |
---|---|---|
committer | Alan Mackenzie <acm@muc.de> | 2019-03-30 17:25:53 +0000 |
commit | 8a23e8717008d31b4648c999c7a417f4729d239f (patch) | |
tree | 63a370a78c8ce92d3ba9a95cda9d00709c7799aa /lisp/mh-e/mh-xface.el | |
parent | 2e04ddadab266d245a3bd0f6c19223ea515bdb90 (diff) | |
parent | b619777dd67e271d639c6fb1d031650af8fd79e6 (diff) | |
download | emacs-8a23e8717008d31b4648c999c7a417f4729d239f.tar.gz |
Merge branch 'master' into scratch/accurate-warning-pos
Diffstat (limited to 'lisp/mh-e/mh-xface.el')
-rw-r--r-- | lisp/mh-e/mh-xface.el | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lisp/mh-e/mh-xface.el b/lisp/mh-e/mh-xface.el index 52e453db531..ddb001ac8fe 100644 --- a/lisp/mh-e/mh-xface.el +++ b/lisp/mh-e/mh-xface.el @@ -1,6 +1,6 @@ ;;; mh-xface.el --- MH-E X-Face and Face header field display -;; Copyright (C) 2002-2003, 2005-2018 Free Software Foundation, Inc. +;; Copyright (C) 2002-2003, 2005-2019 Free Software Foundation, Inc. ;; Author: Bill Wohler <wohler@newt.com> ;; Maintainer: Bill Wohler <wohler@newt.com> @@ -197,7 +197,7 @@ The directories are searched for in the order they appear in the list.") (mh-funcall-if-exists ietf-drums-parse-address from-field)))) (host (and from - (string-match "\\([^+]*\\)\\(+.*\\)?@\\(.*\\)" from) + (string-match "\\([^+]*\\)\\(\\+.*\\)?@\\(.*\\)" from) (downcase (match-string 3 from)))) (user (and host (downcase (match-string 1 from)))) (canonical-address (format "%s@%s" user host)) |