merging Emacs.app (NeXTstep port)

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

diff --git a/lisp/cus-face.el b/lisp/cus-face.el
index 61a06dd..5581cff 100644 (file)
--- a/lisp/cus-face.el
+++ b/lisp/cus-face.el
@@ -8,10 +8,10 @@
 
 ;; This file is part of GNU Emacs.
 
-;; GNU Emacs is free software; you can redistribute it and/or modify
+;; GNU Emacs is free software: you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 3, or (at your option)
-;; any later version.
+;; the Free Software Foundation, either version 3 of the License, or
+;; (at your option) any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -19,9 +19,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs; see the file COPYING.  If not, write to the
-;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-;; Boston, MA 02110-1301, USA.
+;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 ;;
@@ -46,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 mac ns))
              (setq have-window-system t)))
          ;; When making a face after frames already exist
          (if have-window-system
@@ -67,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."
@@ -112,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"