From 574464e23a823bd88e122017cb2ee5f8121cffdf Mon Sep 17 00:00:00 2001 From: Amadeusz Żołnowski Date: Thu, 22 Dec 2016 20:01:00 +0000 Subject: net-mail/notmuch: Keep only latest patch versions Package-Manager: Portage-2.3.3, Repoman-2.3.1 --- .../files/0.23-0001-emacs-id-buttonization.patch | 43 ---------------------- .../files/0.23-0002-emacs-search-face-bugfix.patch | 36 ------------------ 2 files changed, 79 deletions(-) delete mode 100644 net-mail/notmuch/files/0.23-0001-emacs-id-buttonization.patch delete mode 100644 net-mail/notmuch/files/0.23-0002-emacs-search-face-bugfix.patch (limited to 'net-mail/notmuch/files') diff --git a/net-mail/notmuch/files/0.23-0001-emacs-id-buttonization.patch b/net-mail/notmuch/files/0.23-0001-emacs-id-buttonization.patch deleted file mode 100644 index 0c053736be65..000000000000 --- a/net-mail/notmuch/files/0.23-0001-emacs-id-buttonization.patch +++ /dev/null @@ -1,43 +0,0 @@ -From b913a28f65e32380a84da735e0524f8d5c127f93 Mon Sep 17 00:00:00 2001 -From: David Bremner -Date: Sun, 9 Oct 2016 19:30:44 -0300 -Subject: [PATCH 1/3] 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. ---- - emacs/notmuch-show.el | 12 +++++++----- - 1 file changed, 7 insertions(+), 5 deletions(-) - -diff --git a/emacs/notmuch-show.el b/emacs/notmuch-show.el -index 641398d..e7d16f8 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) --- -2.10.1 - diff --git a/net-mail/notmuch/files/0.23-0002-emacs-search-face-bugfix.patch b/net-mail/notmuch/files/0.23-0002-emacs-search-face-bugfix.patch deleted file mode 100644 index 39651cb7c127..000000000000 --- a/net-mail/notmuch/files/0.23-0002-emacs-search-face-bugfix.patch +++ /dev/null @@ -1,36 +0,0 @@ -From e64f1ec1db49406d4834b09d8c4b2aec83ba66cb Mon Sep 17 00:00:00 2001 -From: Mark Walters -Date: Wed, 12 Oct 2016 08:39:21 +0100 -Subject: [PATCH 2/3] emacs: search face bugfix - -In commit 2a7b11b064233afc4feead876fa396e3c18a6b91 the default faces -for unread and flagged were accidentally swapped. This swaps them back. ---- - emacs/notmuch.el | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/emacs/notmuch.el b/emacs/notmuch.el -index 8e14692..48c33fd 100644 ---- a/emacs/notmuch.el -+++ b/emacs/notmuch.el -@@ -313,7 +313,7 @@ there will be called at other points of notmuch execution." - - (defface notmuch-search-flagged-face - '((t -- (:weight bold))) -+ (:foreground "blue"))) - "Face used in search mode face for flagged threads. - - This face is the default value for the \"flagged\" tag in -@@ -323,7 +323,7 @@ This face is the default value for the \"flagged\" tag in - - (defface notmuch-search-unread-face - '((t -- (:foreground "blue"))) -+ (:weight bold))) - "Face used in search mode for unread threads. - - This face is the default value for the \"unread\" tag in --- -2.10.1 - -- cgit v1.2.3-65-gdbad