diff options
| author | Juanma Barranquero <lekktu@gmail.com> | 2014-04-14 17:38:43 +0200 |
|---|---|---|
| committer | Juanma Barranquero <lekktu@gmail.com> | 2014-04-14 17:38:43 +0200 |
| commit | b92583c4bf4a6df612dfcef7e9c5d2a625bee04a (patch) | |
| tree | e152dd965eda615378e8a4f27286b42e1bd93dfb /lisp/faces.el | |
| parent | 6956b278cd1c1584b0dd87823a164e4cf420f6ae (diff) | |
| download | emacs-b92583c4bf4a6df612dfcef7e9c5d2a625bee04a.tar.gz | |
lisp/faces.el (face-set-after-frame-default): Remove unused local variable.
Diffstat (limited to 'lisp/faces.el')
| -rw-r--r-- | lisp/faces.el | 21 |
1 files changed, 10 insertions, 11 deletions
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) |