debian/notmuch
1
0
Fork 0
mirror of https://git.notmuchmail.org/git/notmuch synced 2024-11-22 10:58:10 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

emacs: Fix applying stickiness to the :notmuch-part property

Browse source 
Previously, we simply called pushnew to add :notmuch-part to the
front-sticky and rear-nonsticky text property lists.  This works if
these are nil or lists, but they can also have the value t, meaning
that all properties are front-sticky/rear-nonsticky.  In this case,
pushnew will signal an error because t is not a list.  We never set
these properties to t ourselves, but since we apply these property
changes over arbitrary renderer output, we have to deal with this
possibility.
This commit is contained in:
Austin Clements 2013-06-03 11:17:59 -04:00 committed by David Bremner
parent 5306b2b1e5
commit 109a0355d6
1 changed files with 10 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
emacs/notmuch-show.el
View file

@ -846,11 +846,18 @@ If HIDE is non-nil then initially hide this part."
(notmuch-map-text-property beg (point) :notmuch-part (notmuch-map-text-property beg (point) :notmuch-part
(lambda (v) (or v part))) (lambda (v) (or v part)))
;; Make :notmuch-part front sticky and rear non-sticky so it stays ;; Make :notmuch-part front sticky and rear non-sticky so it stays
;; applied to the beginning of each line when we indent the message. ;; applied to the beginning of each line when we indent the
;; message. Since we're operating on arbitrary renderer output,
;; watch out for sticky specs of t, which means all properties are
;; front-sticky/rear-nonsticky.
(notmuch-map-text-property beg (point) 'front-sticky (notmuch-map-text-property beg (point) 'front-sticky
(lambda (v) (pushnew :notmuch-part v))) (lambda (v) (if (listp v)
(pushnew :notmuch-part v)
v)))
(notmuch-map-text-property beg (point) 'rear-nonsticky (notmuch-map-text-property beg (point) 'rear-nonsticky
(lambda (v) (pushnew :notmuch-part v))))) (lambda (v) (if (listp v)
(pushnew :notmuch-part v)
v)))))
(defun notmuch-show-insert-body (msg body depth) (defun notmuch-show-insert-body (msg body depth)
"Insert the body BODY at depth DEPTH in the current thread." "Insert the body BODY at depth DEPTH in the current thread."