diff options
| author | David Bremner <david@tethera.net> | 2016-10-09 19:30:44 -0300 |
|---|---|---|
| committer | David Bremner <david@tethera.net> | 2016-10-11 22:40:25 -0300 |
| commit | f575a346df09c82691bb9e7c462836d982fe31f7 (patch) | |
| tree | 6d11ef6c8d5e5488d2de13035d2bc1f2c4c52167 | |
| parent | b2d6f07a028a443c2f96e1684be5ec3addb55d96 (diff) | |
emacs/show: force notmuch-show-buttonise-links to act on lines
This seems to fix a problem with emacs 25 creating partial buttons by
calling n-s-b-l with a region that does not include the whole button.
I'm not 100% sure it's legit to act outside the region passed by
jit-lock, but goto-address-fontify-region (where I borrowed the code
from) already does this, so this patch to not make things worse.
| -rw-r--r-- | emacs/notmuch-show.el | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/emacs/notmuch-show.el b/emacs/notmuch-show.el index 641398dc..e7d16f81 100644 --- a/emacs/notmuch-show.el +++ b/emacs/notmuch-show.el @@ -1174,13 +1174,15 @@ This also turns id:\"<message 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) |