debian/notmuch
1
0
Fork 0
mirror of https://git.notmuchmail.org/git/notmuch synced 2024-11-22 02:48:08 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

emacs: More address cleaning.

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

Add more tests.
This commit is contained in:
David Edmondson 2012-01-30 14:59:54 +00:00 committed by David Bremner
parent 6bd3d8af54
commit 32d7b3aabd
2 changed files with 25 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
emacs/notmuch-show.el
View file

@ -316,15 +316,25 @@ unchanged ADDRESS if parsing fails."
(t (t
(setq p-address address))) (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 (when p-name
;; Outer double quotes. ;; Remove elements of the mailbox part that are not relevant for
(when (string-match "^\"\\(.*\\)\"$" p-name) ;; display, even if they are required during transport:
(setq p-name (match-string 1 p-name))) ;;
;; Backslashes. ;; 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 ;; If the address is 'foo@bar.com <foo@bar.com>' then show just
;; 'foo@bar.com'. ;; 'foo@bar.com'.

8
test/emacs-address-cleaning.el
View file

@ -21,11 +21,19 @@
"foo (at home) <foo@bar.com>" "foo (at home) <foo@bar.com>"
"foo [at home] <foo@bar.com>" "foo [at home] <foo@bar.com>"
"Foo Bar" "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>")) "Fred Dibna \\[extraordinaire\\] <fred@dibna.com>"))
(expected '("ДБ <db-uknot@stop.me.uk>" (expected '("ДБ <db-uknot@stop.me.uk>"
"foo (at home) <foo@bar.com>" "foo (at home) <foo@bar.com>"
"foo [at home] <foo@bar.com>" "foo [at home] <foo@bar.com>"
"Foo Bar" "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>")) "Fred Dibna [extraordinaire] <fred@dibna.com>"))
(output (mapcar #'notmuch-show-clean-address input))) (output (mapcar #'notmuch-show-clean-address input)))
(notmuch-test-expect-equal output expected))) (notmuch-test-expect-equal output expected)))