debian/notmuch
1
0
Fork 0
mirror of https://git.notmuchmail.org/git/notmuch synced 2024-12-25 10:54:52 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Make `notmuch-show-clean-address' parsing-error-proof.

Browse source 
Mail-header-parse-address may fail for an invalid address.
Before the change, this would result in empty notmuch-show buffer
with an error message like: Scan error: "Unbalanced parentheses".
The patch wraps the function in condition-case and returns
unchanged address in case of error.
This commit is contained in:
Dmitry Kurochkin 2011-05-12 17:56:25 +04:00 committed by Carl Worth
parent 79a587d963
commit d1cbd833a7
1 changed files with 18 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
emacs/notmuch-show.el
View file

@ -224,22 +224,25 @@ same as that of the previous message."
")"))))))
(defun notmuch-show-clean-address (address)
"Clean a single email address for display."
(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)))
;; If the address is 'foo@bar.com <foo@bar.com>' then show just
;; 'foo@bar.com'.
(when (string= name address)
(setq name nil))
"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)))
;; If the address is 'foo@bar.com <foo@bar.com>' then show just
;; 'foo@bar.com'.
(when (string= name address)
(setq name nil))
(if (not name)
address
(concat name " <" address ">"))))
(if (not name)
address
(concat name " <" address ">")))
(error address)))
(defun notmuch-show-insert-headerline (headers date tags depth)
"Insert a notmuch style headerline based on HEADERS for a