aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard M. Stallman1997-08-27 02:33:40 +0000
committerRichard M. Stallman1997-08-27 02:33:40 +0000
commit3a295f7b0d200b6d9c54684d031a63532fc05451 (patch)
tree2867db04a4e3279258ab97c1d4bd1f6048952a69
parentd30e754bc5eac07e2c74412a4f0e373c7af3e44b (diff)
downloademacs-3a295f7b0d200b6d9c54684d031a63532fc05451.tar.gz
emacs-3a295f7b0d200b6d9c54684d031a63532fc05451.zip
(mail-strip-quoted-names): Retain one whitespace
character between addresses.
-rw-r--r--lisp/mail/mail-utils.el4
1 files changed, 2 insertions, 2 deletions
diff --git a/lisp/mail/mail-utils.el b/lisp/mail/mail-utils.el
index 69701cc196f..a970f866dc9 100644
--- a/lisp/mail/mail-utils.el
+++ b/lisp/mail/mail-utils.el
@@ -150,7 +150,7 @@ Return a modified address list."
150 ;; strip `quoted' names (This is supposed to hack `"Foo Bar" <bar@host>') 150 ;; strip `quoted' names (This is supposed to hack `"Foo Bar" <bar@host>')
151 (setq pos 0) 151 (setq pos 0)
152 (while (setq pos (string-match 152 (while (setq pos (string-match
153 "[ \t]*\"\\([^\"\\]\\|\\\\.\\|\\\\\n\\)*\"[ \t\n]*" 153 "\\([ \t]?\\)[ \t]*\"\\([^\"\\]\\|\\\\.\\|\\\\\n\\)*\"[ \t\n]*"
154 address pos)) 154 address pos))
155 ;; If the next thing is "@", we have "foo bar"@host. Leave it. 155 ;; If the next thing is "@", we have "foo bar"@host. Leave it.
156 (if (and (> (length address) (match-end 0)) 156 (if (and (> (length address) (match-end 0))
@@ -158,7 +158,7 @@ Return a modified address list."
158 (setq pos (match-end 0)) 158 (setq pos (match-end 0))
159 (setq address 159 (setq address
160 (mail-string-delete address 160 (mail-string-delete address
161 pos (match-end 0))))) 161 (match-end 1) (match-end 0)))))
162 ;; Retain only part of address in <> delims, if there is such a thing. 162 ;; Retain only part of address in <> delims, if there is such a thing.
163 (while (setq pos (string-match "\\(,\\s-*\\|\\`\\)[^,]*<\\([^>,:]*>\\)" 163 (while (setq pos (string-match "\\(,\\s-*\\|\\`\\)[^,]*<\\([^>,:]*>\\)"
164 address)) 164 address))