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

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

Fixes: debbugs:12762

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 76cc7e52863b2b1763c104fd288e440cb0df2ace..093d392d7d3f659d32d717da9ef299c04a1e64f4 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -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.

diff --git a/lisp/face-remap.el b/lisp/face-remap.el
index baf1eeb389dce71b0d11d5f323cc13e6334964e1..903c12a787e9d62c761aac16128ad91dd61cdc51 100644 (file)
--- a/lisp/face-remap.el
+++ b/lisp/face-remap.el
@@ -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)