From: David Edmondson <dme@dme.org>
Date: Mon, 30 Jan 2012 14:59:54 +0000 (+0000)
Subject: emacs: More address cleaning.
X-Git-Tag: debian/0.12_rc1-1~124
X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=commitdiff_plain;h=32d7b3aabd4cdba0fcf80e95a701bb64d3bf4980

emacs: More address cleaning.

Remove outer single-quotes from the mailbox part. Allow for multiple
sets of nested single and double quotes.

Add more tests.
---

diff --git a/emacs/notmuch-show.el b/emacs/notmuch-show.el
index 3a1a8c89..26cd2213 100644
--- a/emacs/notmuch-show.el
+++ b/emacs/notmuch-show.el
@@ -316,15 +316,25 @@ unchanged ADDRESS if parsing fails."
        (t
 	(setq p-address address)))
 
-      ;; Remove elements of the mailbox part that are not relevant for
-      ;; display, even if they are required during transport.
       (when p-name
-	;; Outer double quotes.
-	(when (string-match "^\"\\(.*\\)\"$" p-name)
-	  (setq p-name (match-string 1 p-name)))
-
+	;; Remove elements of the mailbox part that are not relevant for
+	;; display, even if they are required during transport:
+	;;
 	;; Backslashes.
-	(setq p-name (replace-regexp-in-string "\\\\" "" p-name)))
+	(setq p-name (replace-regexp-in-string "\\\\" "" p-name))
+
+	;; Outer single and double quotes, which might be nested.
+	(loop
+	 with start-of-loop
+	 do (setq start-of-loop p-name)
+
+	 when (string-match "^\"\\(.*\\)\"$" p-name)
+	 do (setq p-name (match-string 1 p-name))
+
+	 when (string-match "^'\\(.*\\)'$" p-name)
+	 do (setq p-name (match-string 1 p-name))
+
+	 until (string= start-of-loop p-name)))
 
       ;; If the address is 'foo@bar.com <foo@bar.com>' then show just
       ;; 'foo@bar.com'.
diff --git a/test/emacs-address-cleaning.el b/test/emacs-address-cleaning.el
index 3b0b109b..8423245f 100644
--- a/test/emacs-address-cleaning.el
+++ b/test/emacs-address-cleaning.el
@@ -21,11 +21,19 @@
 		  "foo (at home) <foo@bar.com>"
 		  "foo [at home] <foo@bar.com>"
 		  "Foo Bar"
+		  "'Foo Bar' <foo@bar.com>"
+		  "\"'Foo Bar'\" <foo@bar.com>"
+		  "'\"Foo Bar\"' <foo@bar.com>"
+		  "'\"'Foo Bar'\"' <foo@bar.com>"
 		  "Fred Dibna \\[extraordinaire\\] <fred@dibna.com>"))
 	 (expected '("ДБ <db-uknot@stop.me.uk>"
 		     "foo (at home) <foo@bar.com>"
 		     "foo [at home] <foo@bar.com>"
 		     "Foo Bar"
+		     "Foo Bar <foo@bar.com>"
+		     "Foo Bar <foo@bar.com>"
+		     "Foo Bar <foo@bar.com>"
+		     "Foo Bar <foo@bar.com>"
 		     "Fred Dibna [extraordinaire] <fred@dibna.com>"))
 	 (output (mapcar #'notmuch-show-clean-address input)))
     (notmuch-test-expect-equal output expected)))