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

Fix invocation with -rv on the command line

Browse source 
* lisp/frame.el (frame-set-background-mode): Avoid errors from
'face-spec-match-p' when the face was not yet realized for
FRAME.  (Bug#34725)
This commit is contained in:
Eli Zaretskii 2019-03-04 18:28:18 +02:00
parent 4aa74ddd1b
commit 6a1dcf594a
1 changed files with 17 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
lisp/frame.el
View file

@ -1119,9 +1119,23 @@ face specs for the new background mode."
;; most faces are unmodified).
(dolist (face (face-list))
(and (not (get face 'face-override-spec))
(not (face-spec-match-p face
(face-user-default-spec face)
(selected-frame)))
(not (and
;; If the face was not yet realized for the
;; frame, face-spec-match-p will signal an
;; error, so treat such a missing face as
;; having a mismatched spec; the call to
;; face-spec-recalc below will then realize
;; the face for the frame. This happens
;; during startup with -rv on the command
;; line for the initial frame, because frames
;; are not recorded in the pdump file.
(assq face (frame-face-alist))
(face-spec-match-p face
(face-user-default-spec face)
;; FIXME: why selected-frame and
;; not the frame that is the
;; argument to this function?
(selected-frame))))
(push face locally-modified-faces)))
;; Now change to the new frame parameters
(modify-frame-parameters frame params)