From: Juanma Barranquero Date: Mon, 14 Apr 2014 15:38:43 +0000 (+0200) Subject: lisp/faces.el (face-set-after-frame-default): Remove unused local variable. X-Git-Tag: emacs-25.0.90~2640^2~231 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=b92583c4bf4a6df612dfcef7e9c5d2a625bee04a;p=emacs.git lisp/faces.el (face-set-after-frame-default): Remove unused local variable. --- diff --git a/lisp/ChangeLog b/lisp/ChangeLog index fd433562d0e..beb357ac85b 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,7 @@ +2014-04-14 Juanma Barranquero + + * faces.el (face-set-after-frame-default): Remove unused local variable. + 2014-04-12 Stefan Monnier * progmodes/grep.el: Use lexical-binding. diff --git a/lisp/faces.el b/lisp/faces.el index f2ab81bc064..9c115473542 100644 --- a/lisp/faces.el +++ b/lisp/faces.el @@ -2059,17 +2059,16 @@ Calculate the face definitions using the face specs, custom theme settings, X resources, and `face-new-frame-defaults'. Finally, apply any relevant face attributes found amongst the frame parameters in PARAMETERS." - (let ((window-system-p (memq (window-system frame) '(x w32)))) - ;; The `reverse' is so that `default' goes first. - (dolist (face (nreverse (face-list))) - (condition-case () - (progn - ;; Initialize faces from face spec and custom theme. - (face-spec-recalc face frame) - ;; Apply attributes specified by face-new-frame-defaults - (internal-merge-in-global-face face frame)) - ;; Don't let invalid specs prevent frame creation. - (error nil)))) + ;; The `reverse' is so that `default' goes first. + (dolist (face (nreverse (face-list))) + (condition-case () + (progn + ;; Initialize faces from face spec and custom theme. + (face-spec-recalc face frame) + ;; Apply attributes specified by face-new-frame-defaults + (internal-merge-in-global-face face frame)) + ;; Don't let invalid specs prevent frame creation. + (error nil))) ;; Apply attributes specified by frame parameters. (let ((face-params '((foreground-color default :foreground)