(mail-strip-quoted-names):

Delete comments, then delete leading/trailing whitespace.

1 files changed, 7 insertions, 6 deletions

diff --git a/lisp/mail/mail-utils.el b/lisp/mail/mail-utils.el
index 6fae8509a11..849fb517c62 100644
--- a/lisp/mail/mail-utils.el
+++ b/lisp/mail/mail-utils.el
@@ -112,12 +112,6 @@ Return a modified address list."
         (progn (require 'rfc822)
                (mapconcat 'identity (rfc822-addresses address) ", "))
       (let (pos)
-       (string-match "\\`[ \t\n]*" address)
-       ;; strip surrounding whitespace
-       (setq address (substring address
-                                (match-end 0)
-                                (string-match "[ \t\n]*\\'" address
-                                              (match-end 0))))
 
        ;; Detect nested comments.
        (if (string-match "[ \t]*(\\([^)\\]\\|\\\\.\\|\\\\\n\\)*(" address)
@@ -149,6 +143,13 @@ Return a modified address list."
                  (mail-string-delete address
                                      pos (match-end 0)))))
 
+       ;; strip surrounding whitespace
+       (string-match "\\`[ \t\n]*" address)
+       (setq address (substring address
+                                (match-end 0)
+                                (string-match "[ \t\n]*\\'" address
+                                              (match-end 0))))
+
        ;; strip `quoted' names (This is supposed to hack `"Foo Bar" <bar@host>')
        (setq pos 0)
        (while (setq pos (string-match