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

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index fd433562d0ed0ff569c87f7b3d1833f29746434b..beb357ac85ba1e07066cc244876133e6da102f41 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+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>
 
        * progmodes/grep.el: Use lexical-binding.

diff --git a/lisp/faces.el b/lisp/faces.el
index f2ab81bc064c8e97f9ea49266750d1679b0ec1fa..9c1154735424d4662574d4b461c0947cf3dcb814 100644 (file)
--- 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)