Github/emacs
2
0
Fork 1
mirror of git://git.sv.gnu.org/emacs.git synced 2026-02-16 17:24:23 +00:00
Code Issues Projects Releases Packages Wiki Activity

Manage face-remapping-alist properly in face-remap-add-relative.

Browse source 
* face-remap.el (face-remap-add-relative): Handle the case where a
face-remapping-alist entry is a cons cell.

Fixes: debbugs:12762
This commit is contained in:
Chong Yidong 2012-10-29 17:55:57 +08:00
parent d55911cf1d
commit 894b9dd938
2 changed files with 9 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
lisp/ChangeLog
View file

@ -1,3 +1,8 @@
2012-10-29 Chong Yidong <cyd@gnu.org>
* face-remap.el (face-remap-add-relative): Handle the case where a
face-remapping-alist entry is a cons cell (Bug#12762).
2012-10-29 Glenn Morris <rgm@gnu.org>
* emacs-lisp/cl.el (defsetf): Doc fix.

5
lisp/face-remap.el
View file

@ -132,7 +132,10 @@ other than the normal definition of FACE via `face-remap-set-base'."
(when (null entry)
(setq entry (list face face)) ; explicitly merge with global def
(push entry face-remapping-alist))
(setcdr entry (face-remap-order (cons specs (cdr entry))))
(let ((faces (cdr entry)))
(if (symbolp faces)
(setq faces (list faces)))
(setcdr entry (face-remap-order (cons specs faces))))
(cons face specs)))
(defun face-remap-remove-relative (cookie)