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

emacs: Handle all face forms when combining faces

Browse source 
Previously, notmuch-combine-face-text-property assumed that any
existing face properties of the modified text were already in face
list form.  This was true as long as it was the only function
manipulating faces (since it always produced a list form face), but if
anything else has manipulated the face, it was more likely to be
either a face name or a face plist.  It also didn't correctly handle
face lists as arguments, even though the doc string claimed it did.

This patch fixes notmuch-combine-face-text-property to handle all face
forms correctly by canonicalizing both the argument face and the
existing faces into list form.  This also means we can set the face to
a simpler non-list form if there's no existing face.
This commit is contained in:
Austin Clements 2013-02-04 16:37:01 -05:00 committed by David Bremner
parent 6a38b5db37
commit 3ddb4dc806
1 changed files with 23 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
emacs/notmuch-lib.el
View file

@ -316,6 +316,16 @@ current buffer, if possible."
(loop for (key value . rest) on plist by #'cddr
collect (cons (intern (substring (symbol-name key) 1)) value)))
(defun notmuch-face-ensure-list-form (face)
"Return FACE in face list form.
If FACE is already a face list, it will be returned as-is. If
FACE is a face name or face plist, it will be returned as a
single element face list."
(if (and (listp face) (not (keywordp (car face))))
face
(list face)))
(defun notmuch-combine-face-text-property (start end face)
"Combine FACE into the 'face text property between START and END.
@ -324,11 +334,20 @@ and END. Attributes specified by FACE take precedence over
existing attributes. FACE must be a face name (a symbol or
string), a property list of face attributes, or a list of these."
(let ((pos start))
;; A face property can have three forms: a face name (a string or
;; symbol), a property list, or a list of these two forms. In the
;; list case, the faces will be combined, with the earlier faces
;; taking precedent. Here we canonicalize everything to list form
;; to make it easy to combine.
(let ((pos start)
(face-list (notmuch-face-ensure-list-form face)))
(while (< pos end)
(let ((cur (get-text-property pos 'face))
(next (next-single-property-change pos 'face nil end)))
(put-text-property pos next 'face (cons face cur))
(let* ((cur (get-text-property pos 'face))
(cur-list (notmuch-face-ensure-list-form cur))
(new (cond ((null cur-list) face)
(t (append face-list cur-list))))
(next (next-single-property-change pos 'face nil end)))
(put-text-property pos next 'face new)
(setq pos next)))))
(defun notmuch-logged-error (msg &optional extra)