[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/lisp/faces.el,v
From: |
Stefan Monnier |
Subject: |
[Emacs-diffs] Changes to emacs/lisp/faces.el,v |
Date: |
Thu, 19 Jun 2008 01:57:21 +0000 |
CVSROOT: /sources/emacs
Module name: emacs
Changes by: Stefan Monnier <monnier> 08/06/19 01:57:20
Index: lisp/faces.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/faces.el,v
retrieving revision 1.410
retrieving revision 1.411
diff -u -b -r1.410 -r1.411
--- lisp/faces.el 18 Jun 2008 21:14:07 -0000 1.410
+++ lisp/faces.el 19 Jun 2008 01:57:17 -0000 1.411
@@ -703,7 +703,7 @@
(put (or (get face 'face-alias) face) 'face-modified t))
(while args
;; Don't recursively set the attributes from the frame's font param
- ;; when we update the frame's font param fro the attributes.
+ ;; when we update the frame's font param from the attributes.
(let ((inhibit-face-set-after-frame-default t))
(if (and (eq (car args) :family)
(stringp (cadr args))
@@ -2018,6 +2018,7 @@
;; Find attributes that should be initialized from frame parameters.
(let ((face-params '((foreground-color default :foreground)
(background-color default :background)
+ (font-parameter default :font)
(border-color border :background)
(cursor-color cursor :background)
(scroll-bar-foreground scroll-bar :foreground)
- [Emacs-diffs] Changes to emacs/lisp/faces.el,v, Chong Yidong, 2008/06/10
- [Emacs-diffs] Changes to emacs/lisp/faces.el,v, Glenn Morris, 2008/06/11
- [Emacs-diffs] Changes to emacs/lisp/faces.el,v, Kenichi Handa, 2008/06/12
- [Emacs-diffs] Changes to emacs/lisp/faces.el,v, Kenichi Handa, 2008/06/12
- [Emacs-diffs] Changes to emacs/lisp/faces.el,v, Kenichi Handa, 2008/06/12
- [Emacs-diffs] Changes to emacs/lisp/faces.el,v, Stefan Monnier, 2008/06/18
- [Emacs-diffs] Changes to emacs/lisp/faces.el,v,
Stefan Monnier <=
- [Emacs-diffs] Changes to emacs/lisp/faces.el,v, Chong Yidong, 2008/06/21
- [Emacs-diffs] Changes to emacs/lisp/faces.el,v, Chong Yidong, 2008/06/24
- [Emacs-diffs] Changes to emacs/lisp/faces.el,v, Andreas Schwab, 2008/06/24
- [Emacs-diffs] Changes to emacs/lisp/faces.el,v, Chong Yidong, 2008/06/25
- [Emacs-diffs] Changes to emacs/lisp/faces.el,v, Chong Yidong, 2008/06/28
- [Emacs-diffs] Changes to emacs/lisp/faces.el,v, Juri Linkov, 2008/06/30