HCoop
/
bpt
/
emacs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-13
[bpt/emacs.git]
/
lisp
/
faces.el
diff --git
a/lisp/faces.el
b/lisp/faces.el
index
d3e298d
..
67f8a2a
100644
(file)
--- a/
lisp/faces.el
+++ b/
lisp/faces.el
@@
-1,7
+1,7
@@
;;; faces.el --- Lisp faces
;; Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
;;; faces.el --- Lisp faces
;; Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
-;; 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+;; 2002, 2003, 2004, 2005
, 2006
Free Software Foundation, Inc.
;; Maintainer: FSF
;; Keywords: internal
;; Maintainer: FSF
;; Keywords: internal
@@
-1100,7
+1100,7
@@
of a global face. Value is the new attribute value."
If optional argument FRAME is nil or omitted, use the selected frame."
(let ((completion-ignore-case t))
(completing-read (format "Set font attributes of face `%s' from font: " face)
If optional argument FRAME is nil or omitted, use the selected frame."
(let ((completion-ignore-case t))
(completing-read (format "Set font attributes of face `%s' from font: " face)
- (
x-list-fonts "*" nil frame
))))
+ (
append (fontset-list) (x-list-fonts "*" nil frame)
))))
(defun read-all-face-attributes (face &optional frame)
(defun read-all-face-attributes (face &optional frame)
@@
-1274,7
+1274,8
@@
If FRAME is omitted or nil, use the selected frame."
(:box . "Box")
(:inverse-video . "Inverse")
(:stipple . "Stipple")
(:box . "Box")
(:inverse-video . "Inverse")
(:stipple . "Stipple")
- (:font . "Font or fontset")
+ (:font . "Font")
+ (:fontset . "Fontset")
(:inherit . "Inherit")))
(max-width (apply #'max (mapcar #'(lambda (x) (length (cdr x)))
attrs))))
(:inherit . "Inherit")))
(max-width (apply #'max (mapcar #'(lambda (x) (length (cdr x)))
attrs))))