From: David Bremner Date: Wed, 12 Oct 2016 01:42:26 +0000 (-0300) Subject: merge buttonise-links patch to master X-Git-Tag: 0.24_rc0~125 X-Git-Url: https://git.notmuchmail.org/git?a=commitdiff_plain;h=5d05523659912c6b4221fe5246261df601ea41c8;hp=9259c7971d0839b4fcfda348c33761048b441064;p=notmuch merge buttonise-links patch to master --- diff --git a/emacs/notmuch-show.el b/emacs/notmuch-show.el index f2487abf..643dee6e 100644 --- a/emacs/notmuch-show.el +++ b/emacs/notmuch-show.el @@ -1174,13 +1174,15 @@ This also turns id:\"\"-parts and mid: links into buttons for a corresponding notmuch search." (goto-address-fontify-region start end) (save-excursion - (let (links) - (goto-char start) - (while (re-search-forward notmuch-id-regexp end t) + (let (links + (beg-line (progn (goto-char start) (line-beginning-position))) + (end-line (progn (goto-char end) (line-end-position)))) + (goto-char beg-line) + (while (re-search-forward notmuch-id-regexp end-line t) (push (list (match-beginning 0) (match-end 0) (match-string-no-properties 0)) links)) - (goto-char start) - (while (re-search-forward notmuch-mid-regexp end t) + (goto-char beg-line) + (while (re-search-forward notmuch-mid-regexp end-line t) (let* ((mid-cid (match-string-no-properties 1)) (mid (save-match-data (string-match "^[^/]*" mid-cid)