From: Dmitry Kurochkin <dmitry.kurochkin@gmail.com>
To: notmuch@notmuchmail.org
Subject: [PATCH 5/5] Simplify message and headers visibility code in notmuch-show view.
Date: Thu, 26 May 2011 02:10:16 +0400 [thread overview]
Message-ID: <1306361416-5019-6-git-send-email-dmitry.kurochkin@gmail.com> (raw)
In-Reply-To: <1306361416-5019-1-git-send-email-dmitry.kurochkin@gmail.com>
Before the change, headers and message visibility functions took
extra care to correctly set `buffer-invisibility-spec'. This was
needed because headers overlay `invisible' property had only
headers' invisibility spec. So visibility of headers was
determined only by the headers invisibility spec. The patch sets
headers overlay `invisible' property a list with both the headers
and the message invisibility spec. This makes headers invisible
if either of them is added to the `buffer-invisibility-spec' and
allows to simplify the code.
---
emacs/notmuch-show.el | 18 +++++-------------
1 files changed, 5 insertions(+), 13 deletions(-)
diff --git a/emacs/notmuch-show.el b/emacs/notmuch-show.el
index e1846bc..2f7154e 100644
--- a/emacs/notmuch-show.el
+++ b/emacs/notmuch-show.el
@@ -733,8 +733,9 @@ current buffer, if possible."
;; message.
(put-text-property message-start message-end :notmuch-message-extent (cons message-start message-end))
- (let ((headers-overlay (make-overlay headers-start headers-end)))
- (overlay-put headers-overlay 'invisible headers-invis-spec)
+ (let ((headers-overlay (make-overlay headers-start headers-end))
+ (invis-specs (list headers-invis-spec message-invis-spec)))
+ (overlay-put headers-overlay 'invisible invis-specs)
(overlay-put headers-overlay 'priority 10))
(overlay-put (make-overlay body-start body-end) 'invisible message-invis-spec)
@@ -974,20 +975,11 @@ All currently available key bindings:
(add-to-invisibility-spec spec))))
(defun notmuch-show-message-visible (props visible-p)
- (if visible-p
- ;; When making the message visible, the headers may or not be
- ;; visible. So we check that property separately.
- (let ((headers-visible (plist-get props :headers-visible)))
- (notmuch-show-element-visible props headers-visible :headers-invis-spec)
- (notmuch-show-element-visible props t :message-invis-spec))
- (notmuch-show-element-visible props nil :headers-invis-spec)
- (notmuch-show-element-visible props nil :message-invis-spec))
-
+ (notmuch-show-element-visible props visible-p :message-invis-spec)
(notmuch-show-set-prop :message-visible visible-p props))
(defun notmuch-show-headers-visible (props visible-p)
- (if (plist-get props :message-visible)
- (notmuch-show-element-visible props visible-p :headers-invis-spec))
+ (notmuch-show-element-visible props visible-p :headers-invis-spec)
(notmuch-show-set-prop :headers-visible visible-p props))
;; Functions for setting and getting attributes of the current
--
1.7.5.1
next prev parent reply other threads:[~2011-05-25 22:10 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-05-25 22:10 [PATCH] Fix hiding a message while some citations are visible Dmitry Kurochkin
2011-05-25 22:10 ` [PATCH 1/5] Pass message to the `notmuch-show-insert-text/plain-hook' hook Dmitry Kurochkin
2011-05-25 22:10 ` [PATCH 2/5] Set message invisibility spec properties before inserting the body Dmitry Kurochkin
2011-05-25 22:10 ` [PATCH 3/5] Fix hiding a message while some citations are shown in notmuch-show view Dmitry Kurochkin
2011-05-25 22:23 ` Carl Worth
2011-05-25 22:34 ` Dmitry Kurochkin
2011-05-25 22:46 ` Carl Worth
2011-05-25 23:10 ` Dmitry Kurochkin
2011-05-26 1:02 ` Carl Worth
2011-05-26 10:26 ` Dmitry Kurochkin
2011-05-26 21:31 ` Carl Worth
2011-05-26 21:42 ` Dmitry Kurochkin
2011-06-15 14:06 ` Carl Worth
2011-06-15 14:25 ` Dmitry Kurochkin
2011-06-15 16:16 ` Jameson Graef Rollins
2011-06-15 17:00 ` Carl Worth
2011-06-15 17:10 ` Dmitry Kurochkin
2011-05-25 22:10 ` [PATCH 4/5] Set higher priority for headers and hidden citation overlays Dmitry Kurochkin
2011-05-25 22:10 ` Dmitry Kurochkin [this message]
2011-05-26 21:38 ` [PATCH 1/2] test: add tests for hiding messages in notmuch-show view Dmitry Kurochkin
2011-05-26 21:38 ` [PATCH 2/2] Workaround for Emacs bug #8721 Dmitry Kurochkin
2011-05-26 21:48 ` Dmitry Kurochkin
2011-05-28 1:29 ` Dmitry Kurochkin
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://notmuchmail.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1306361416-5019-6-git-send-email-dmitry.kurochkin@gmail.com \
--to=dmitry.kurochkin@gmail.com \
--cc=notmuch@notmuchmail.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://yhetil.org/notmuch.git/
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).