* net/tramp.el (tramp-read-passwd): Cached passwords shall still be used.

[gnu-emacs] / lisp / cus-face.el

diff --git a/lisp/cus-face.el b/lisp/cus-face.el
index 4be3b7552ba60e36ff209873c165651329b30462..78c28b058daf9761a633641d22201a7e288266db 100644 (file)
--- a/lisp/cus-face.el
+++ b/lisp/cus-face.el
@@ -1,7 +1,7 @@
 ;;; cus-face.el --- customization support for faces
 ;;
 ;; Copyright (C) 1996, 1997, 1999, 2000, 2001, 2002, 2003, 2004,
-;;   2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+;;   2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 ;;
 ;; Author: Per Abrahamsen <abraham@dina.kvl.dk>
 ;; Keywords: help, faces
@@ -44,7 +44,7 @@
          ;; Create frame-local faces
          (dolist (frame (frame-list))
            (face-spec-set-2 face frame value)
-           (when (memq (window-system frame) '(x w32 mac))
+           (when (memq (window-system frame) '(x w32 ns))
              (setq have-window-system t)))
          ;; When making a face after frames already exist
          (if have-window-system
@@ -65,6 +65,10 @@
      (string :tag "Font Family"
             :help-echo "Font family or fontset alias name."))
 
+    (:foundry
+     (string :tag "Font Foundry"
+            :help-echo "Font foundry name."))
+
     (:width
      (choice :tag "Width"
             :help-echo "Font width."
@@ -110,7 +114,8 @@
             (const :tag "semibold" semi-bold)
             (const :tag "semilight" semi-light)
             (const :tag "ultralight" ultra-light)
-            (const :tag "ultrabold" ultra-bold)))
+            (const :tag "ultrabold" ultra-bold)
+            (const :tag "thin" thin)))
 
     (:slant
      (choice :tag "Slant"