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: limit search for attachment to stop at first mime-part

Browse source 
This commit changes the behaviour of notmuch-mua-attachment-check
so that it stops searching for notmuch-mua-attachment-regexp when a
new mime-part is reached.  This avoids false warnings when matching
words occur inside forwarded messages.
This commit is contained in:
Örjan Ekeberg 2019-12-13 00:35:35 +01:00 committed by David Bremner
parent 6cd47227de
commit 1d9ec88d87
1 changed files with 14 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
emacs/notmuch-mua.el
View file

@ -137,7 +137,10 @@ Typically this is added to `notmuch-mua-send-hook'."
;; When the message mentions attachment... ;; When the message mentions attachment...
(save-excursion (save-excursion
(message-goto-body) (message-goto-body)
(loop while (re-search-forward notmuch-mua-attachment-regexp (point-max) t) ;; Limit search from reaching other possible parts of the message
(let ((search-limit (search-forward "\n<#" nil t)))
(message-goto-body)
(loop while (re-search-forward notmuch-mua-attachment-regexp search-limit t)
;; For every instance of the "attachment" string ;; For every instance of the "attachment" string
;; found, examine the text properties. If the text ;; found, examine the text properties. If the text
;; has either a `face' or `syntax-table' property ;; has either a `face' or `syntax-table' property
@ -147,7 +150,7 @@ Typically this is added to `notmuch-mua-send-hook'."
(not (or (memq 'syntax-table props) (not (or (memq 'syntax-table props)
(memq 'face props)))) (memq 'face props))))
return t return t
finally return nil)) finally return nil)))
;; ...but doesn't have a part with a filename... ;; ...but doesn't have a part with a filename...
(save-excursion (save-excursion
(message-goto-body) (message-goto-body)