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

emacs: Avoid mail-header-parse-address' in notmuch-show-clean-address'.

Browse source 
`mail-header-parse-address' expects un-decoded mailbox parts, which is
not what we have at this point. Replace it with simple string
deconstruction.

Mark the corresponding test as no longer broken.

Minor whitespace cleanup.
This commit is contained in:
David Edmondson 2012-01-25 13:53:58 +00:00 committed by David Bremner
parent 3f003a3ae0
commit cbc4876a33
2 changed files with 35 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

46
emacs/notmuch-show.el
View file

@ -294,21 +294,43 @@ operation on the contents of the current buffer."
"Try to clean a single email ADDRESS for display. Return
unchanged ADDRESS if parsing fails."
(condition-case nil
(let* ((parsed (mail-header-parse-address address))
(address (car parsed))
(name (cdr parsed)))
;; Remove double quotes. They might be required during transport,
;; but we don't need to see them.
(when name
(setq name (replace-regexp-in-string "\"" "" name)))
(let (p-name p-address)
;; It would be convenient to use `mail-header-parse-address',
;; but that expects un-decoded mailbox parts, whereas our
;; mailbox parts are already decoded (and hence may contain
;; UTF-8). Given that notmuch should handle most of the awkward
;; cases, some simple string deconstruction should be sufficient
;; here.
(cond
;; "User <user@dom.ain>" style.
((string-match "\\(.*\\) <\\(.*\\)>" address)
(setq p-name (match-string 1 address)
p-address (match-string 2 address)))
;; "<user@dom.ain>" style.
((string-match "<\\(.*\\)>" address)
(setq p-address (match-string 1 address)))
;; Everything else.
(t
(setq p-address address)))
;; Remove outer double quotes. They might be required during
;; transport, but we don't need to see them.
(when (and p-name
(string-match "^\"\\(.*\\)\"$" p-name))
(setq p-name (match-string 1 p-name)))
;; If the address is 'foo@bar.com <foo@bar.com>' then show just
;; 'foo@bar.com'.
(when (string= name address)
(setq name nil))
(when (string= p-name p-address)
(setq p-name nil))
(if (not name)
address
(concat name " <" address ">")))
;; If no name results, return just the address.
(if (not p-name)
p-address
;; Otherwise format the name and address together.
(concat p-name " <" p-address ">")))
(error address)))
(defun notmuch-show-insert-headerline (headers date tags depth)

1
test/emacs-address-cleaning.sh
View file

@ -12,7 +12,6 @@ test_emacs_expect_t \
'(load "emacs-address-cleaning.el") (notmuch-test-address-cleaning-2)'
test_begin_subtest "notmuch-test-address-clean part 3"
test_subtest_known_broken
test_emacs_expect_t \
'(load "emacs-address-cleaning.el") (notmuch-test-address-cleaning-3)'