Commit b92583c4 authored by Juanma Barranquero's avatar Juanma Barranquero
Browse files

lisp/faces.el (face-set-after-frame-default): Remove unused local variable.

parent 6956b278
2014-04-14 Juanma Barranquero <lekktu@gmail.com>
* faces.el (face-set-after-frame-default): Remove unused local variable.
2014-04-12 Stefan Monnier <monnier@iro.umontreal.ca> 2014-04-12 Stefan Monnier <monnier@iro.umontreal.ca>
   
* progmodes/grep.el: Use lexical-binding. * progmodes/grep.el: Use lexical-binding.
......
...@@ -2059,17 +2059,16 @@ Calculate the face definitions using the face specs, custom theme ...@@ -2059,17 +2059,16 @@ Calculate the face definitions using the face specs, custom theme
settings, X resources, and `face-new-frame-defaults'. settings, X resources, and `face-new-frame-defaults'.
Finally, apply any relevant face attributes found amongst the Finally, apply any relevant face attributes found amongst the
frame parameters in PARAMETERS." frame parameters in PARAMETERS."
(let ((window-system-p (memq (window-system frame) '(x w32)))) ;; The `reverse' is so that `default' goes first.
;; The `reverse' is so that `default' goes first. (dolist (face (nreverse (face-list)))
(dolist (face (nreverse (face-list))) (condition-case ()
(condition-case () (progn
(progn ;; Initialize faces from face spec and custom theme.
;; Initialize faces from face spec and custom theme. (face-spec-recalc face frame)
(face-spec-recalc face frame) ;; Apply attributes specified by face-new-frame-defaults
;; Apply attributes specified by face-new-frame-defaults (internal-merge-in-global-face face frame))
(internal-merge-in-global-face face frame)) ;; Don't let invalid specs prevent frame creation.
;; Don't let invalid specs prevent frame creation. (error nil)))
(error nil))))
;; Apply attributes specified by frame parameters. ;; Apply attributes specified by frame parameters.
(let ((face-params '((foreground-color default :foreground) (let ((face-params '((foreground-color default :foreground)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment