[Emacs-diffs] trunk r116976: lisp/faces.el (face-set-after-frame-default): Remove unused local variable.

[Juanma Barranquero]

------------------------------------------------------------
revno: 116976
revision-id: address@hidden
parent: address@hidden
committer: Juanma Barranquero <address@hidden>
branch nick: trunk
timestamp: Mon 2014-04-14 17:38:43 +0200
message:
  lisp/faces.el (face-set-after-frame-default): Remove unused local variable.
modified:
  lisp/ChangeLog                 changelog-20091113204419-o5vbwnq5f7feedwu-1432
  lisp/faces.el                  faces.el-20091113204419-o5vbwnq5f7feedwu-562

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2014-04-12 19:38:06 +0000
+++ b/lisp/ChangeLog    2014-04-14 15:38:43 +0000
@@ -1,3 +1,7 @@
+2014-04-14  Juanma Barranquero  <address@hidden>
+
+       * faces.el (face-set-after-frame-default): Remove unused local variable.
+
 2014-04-12  Stefan Monnier  <address@hidden>
 
        * progmodes/grep.el: Use lexical-binding.

=== modified file 'lisp/faces.el'
--- a/lisp/faces.el     2014-04-12 19:24:17 +0000
+++ b/lisp/faces.el     2014-04-14 15:38:43 +0000
@@ -2059,17 +2059,16 @@
 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)