procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Make face-remap-set-base work with a single face again

Browse source 
* lisp/face-remap.el (face-remap-set-base): Fix regression
introduced by cece37cf09 (bug#46973).
This commit is contained in:
Lars Ingebrigtsen 2022-02-23 12:50:07 +01:00
parent 4f53789a0a
commit 7b0b27971b
1 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
lisp/face-remap.el
View file

@ -207,10 +207,12 @@ If SPECS is empty or a single face `eq' to FACE, call `face-remap-reset-base'
to use the normal definition of FACE as the base remapping; note that
this is different from SPECS containing a single value nil, which means
not to inherit from the global definition of FACE at all."
;; Simplify the specs in the case where it's just a single face (and
;; it's not a list with just a nil).
(while (and (consp specs) (not (null (car specs))) (null (cdr specs)))
(setq specs (car specs)))
(if (or (null specs)
(and (eq (car specs) face) (null (cdr specs)))) ; default
(eq specs face)) ; default
;; Set entry back to default
(face-remap-reset-base face)
;; Set the base remapping