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

Simplify message and headers visibility code in notmuch-show view.

Browse source 
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.
This commit is contained in:
Dmitry Kurochkin 2011-05-26 02:10:16 +04:00 committed by Carl Worth
parent 4a9d0ac147
commit 52f751fb74
1 changed files with 5 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
emacs/notmuch-show.el
View file

@ -753,8 +753,9 @@ current buffer, if possible."
;; message. ;; message.
(put-text-property message-start message-end :notmuch-message-extent (cons message-start message-end)) (put-text-property message-start message-end :notmuch-message-extent (cons message-start message-end))
(let ((headers-overlay (make-overlay headers-start headers-end))) (let ((headers-overlay (make-overlay headers-start headers-end))
(overlay-put headers-overlay 'invisible headers-invis-spec) (invis-specs (list headers-invis-spec message-invis-spec)))
(overlay-put headers-overlay 'invisible invis-specs)
(overlay-put headers-overlay 'priority 10)) (overlay-put headers-overlay 'priority 10))
(overlay-put (make-overlay body-start body-end) 'invisible message-invis-spec) (overlay-put (make-overlay body-start body-end) 'invisible message-invis-spec)
@ -994,20 +995,11 @@ All currently available key bindings:
(add-to-invisibility-spec spec)))) (add-to-invisibility-spec spec))))
(defun notmuch-show-message-visible (props visible-p) (defun notmuch-show-message-visible (props visible-p)
(if visible-p (notmuch-show-element-visible props visible-p :message-invis-spec)
;; 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-set-prop :message-visible visible-p props)) (notmuch-show-set-prop :message-visible visible-p props))
(defun notmuch-show-headers-visible (props visible-p) (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)) (notmuch-show-set-prop :headers-visible visible-p props))
;; Functions for setting and getting attributes of the current ;; Functions for setting and getting attributes of the current