[Emacs-diffs] /srv/bzr/emacs/trunk r99464: Fix setting family and foundry in set-face-attribute (Bug#5536).

[Chong Yidong]

------------------------------------------------------------
revno: 99464
committer: Chong Yidong <address@hidden>
branch nick: trunk
timestamp: Sat 2010-02-06 23:14:26 -0500
message:
  Fix setting family and foundry in set-face-attribute (Bug#5536).
  
  * faces.el (set-face-attribute): Allow calling
  internal-set-lisp-face-attribute with 'unspecified family and
  foundry argument (Bug#5536).
modified:
  lisp/ChangeLog
  lisp/faces.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2010-02-07 01:41:45 +0000
+++ b/lisp/ChangeLog    2010-02-07 04:14:26 +0000
@@ -1,3 +1,9 @@
+2010-02-07  sj  <address@hidden>  (tiny change)
+
+       * faces.el (set-face-attribute): Allow calling
+       internal-set-lisp-face-attribute with 'unspecified family and
+       foundry argument (Bug#5536).
+
 2010-02-07  Glenn Morris  <address@hidden>
 
        * progmodes/f90.el (f90-font-lock-keywords-2)

=== modified file 'lisp/faces.el'
--- a/lisp/faces.el     2010-01-13 08:35:10 +0000
+++ b/lisp/faces.el     2010-02-07 04:14:26 +0000
@@ -735,10 +735,10 @@
        (unless foundry
          (setq foundry (match-string 1 family)))
        (setq family (match-string 2 family)))
-      (when (stringp family)
+      (when (or (stringp family) (eq family 'unspecified))
        (internal-set-lisp-face-attribute face :family (purecopy family)
                                          where))
-      (when (stringp foundry)
+      (when (or (stringp foundry) (eq foundry 'unspecified))
        (internal-set-lisp-face-attribute face :foundry (purecopy foundry)
                                          where)))
     (while args