Small sysdep.c cleanups.

[bpt/emacs.git] / lisp / cus-face.el

diff --git a/lisp/cus-face.el b/lisp/cus-face.el
index 9ef9428..f6a0750 100644 (file)
--- a/lisp/cus-face.el
+++ b/lisp/cus-face.el
@@ -1,10 +1,11 @@
 ;;; 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, 2010 Free Software Foundation, Inc.
 ;;
 ;; Author: Per Abrahamsen <abraham@dina.kvl.dk>
 ;; Keywords: help, faces
+;; Package: emacs
 
 ;; This file is part of GNU Emacs.
 
@@ -44,13 +45,13 @@
          ;; 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
              (make-face-x-resource-internal face)))))
     ;; Don't record SPEC until we see it causes no errors.
-    (put face 'face-defface-spec spec)
+    (put face 'face-defface-spec (purecopy spec))
     (push (cons 'defface face) current-load-list)
     (when (and doc (null (face-documentation face)))
       (set-face-documentation face (purecopy doc)))
@@ -65,6 +66,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."