diff options
| author |  Dmitry Kurochkin <dmitry.kurochkin@gmail.com> | 2011-05-26 02:10:16 +0400 |
|---|---|---|
| committer |  Carl Worth <cworth@cworth.org> | 2011-06-15 07:07:32 -0700 |
| commit | 52f751fb7442d7fd79e2a7dae5858f23e28e4438 (patch) | |
| tree | 5741934f943ae0236bfd398ef19cdb5c8232af8a /emacs | |
| parent | 4a9d0ac1472f7bd8b785256366720e3e6aa2855f (diff) | |
Simplify message and headers visibility code in notmuch-show view.
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.
Diffstat (limited to 'emacs')
| -rw-r--r-- | 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 a49bbd3d..0d9b52a7 100644 --- a/emacs/notmuch-show.el +++ b/emacs/notmuch-show.el @@ -753,8 +753,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) @@ -994,20 +995,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 |