HCoop
/
bpt
/
emacs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Small sysdep.c cleanups.
[bpt/emacs.git]
/
lisp
/
cus-face.el
diff --git
a/lisp/cus-face.el
b/lisp/cus-face.el
index
61a06dd
..
f6a0750
100644
(file)
--- a/
lisp/cus-face.el
+++ b/
lisp/cus-face.el
@@
-1,17
+1,18
@@
;;; cus-face.el --- customization support for faces
;;
;; Copyright (C) 1996, 1997, 1999, 2000, 2001, 2002, 2003, 2004,
;;; 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
;;
;; Author: Per Abrahamsen <abraham@dina.kvl.dk>
;; Keywords: help, faces
+;; Package: emacs
;; This file is part of GNU Emacs.
;; 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
;; 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
;; GNU Emacs is distributed in the hope that it will be useful,
;; but WITHOUT ANY WARRANTY; without even the implied warranty of
@@
-19,9
+20,7
@@
;; GNU General Public License for more details.
;; You should have received a copy of the GNU General Public License
;; 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:
;;
;;; Commentary:
;;
@@
-46,13
+45,13
@@
;; Create frame-local faces
(dolist (frame (frame-list))
(face-spec-set-2 face frame value)
;; 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.
(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)))
(push (cons 'defface face) current-load-list)
(when (and doc (null (face-documentation face)))
(set-face-documentation face (purecopy doc)))
@@
-67,6
+66,10
@@
(string :tag "Font Family"
:help-echo "Font family or fontset alias name."))
(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."
(:width
(choice :tag "Width"
:help-echo "Font width."
@@
-112,7
+115,8
@@
(const :tag "semibold" semi-bold)
(const :tag "semilight" semi-light)
(const :tag "ultralight" ultra-light)
(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"
(:slant
(choice :tag "Slant"