From: Richard M. Stallman <rms@gnu.org>
Date: Sat, 9 May 1998 06:40:53 +0000 (+0000)
Subject: (mail-strip-quoted-names):
X-Git-Tag: emacs-20.3~1075
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=ee019c842f1d9fa06f7977e1bd1d9842e69088c7;p=emacs.git

(mail-strip-quoted-names):
Delete comments, then delete leading/trailing whitespace.
---

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