From: Dmitry Kurochkin Date: Wed, 25 May 2011 22:10:15 +0000 (+0400) Subject: Set higher priority for headers and hidden citation overlays. X-Git-Tag: debian/0.6_254~32 X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=commitdiff_plain;h=4a9d0ac1472f7bd8b785256366720e3e6aa2855f Set higher priority for headers and hidden citation overlays. Before the patch, message, headers and hidden citation overlays had zero priority. All these overlay have `invisible' property. Emacs documentation says that we should not make assumptions about which overlay will prevail when they have the same priority [1]. It happens to work as we need, but we should not rely on undocumented behavior. [1] http://www.gnu.org/s/emacs/manual/html_node/elisp/Overlay-Properties.html --- diff --git a/emacs/notmuch-show.el b/emacs/notmuch-show.el index 5436b341..a49bbd3d 100644 --- a/emacs/notmuch-show.el +++ b/emacs/notmuch-show.el @@ -753,7 +753,9 @@ current buffer, if possible." ;; message. (put-text-property message-start message-end :notmuch-message-extent (cons message-start message-end)) - (overlay-put (make-overlay headers-start headers-end) 'invisible headers-invis-spec) + (let ((headers-overlay (make-overlay headers-start headers-end))) + (overlay-put headers-overlay 'invisible headers-invis-spec) + (overlay-put headers-overlay 'priority 10)) (overlay-put (make-overlay body-start body-end) 'invisible message-invis-spec) ;; Save the properties for this message. Currently this saves the diff --git a/emacs/notmuch-wash.el b/emacs/notmuch-wash.el index 8607fb00..92f07c50 100644 --- a/emacs/notmuch-wash.el +++ b/emacs/notmuch-wash.el @@ -156,6 +156,7 @@ insert before the button, probably for indentation." (add-to-invisibility-spec invis-spec) (overlay-put overlay 'invisible (list invis-spec message-invis-spec)) (overlay-put overlay 'isearch-open-invisible #'notmuch-wash-region-isearch-show) + (overlay-put overlay 'priority 10) (overlay-put overlay 'type type) (goto-char (1+ end)) (save-excursion