aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard M. Stallman2007-12-29 19:10:34 +0000
committerRichard M. Stallman2007-12-29 19:10:34 +0000
commit20d29b0bbc8650957cf62643ff8e6683709693c5 (patch)
treed055989e4b158713e1abe6e15f2091121998cbf5
parent422abbfd2240b7e9e05907dac4d5afc6aa452c81 (diff)
downloademacs-20d29b0bbc8650957cf62643ff8e6683709693c5.tar.gz
emacs-20d29b0bbc8650957cf62643ff8e6683709693c5.zip
(facep): Doc fix.
-rw-r--r--lisp/ChangeLog2
-rw-r--r--lisp/faces.el6
2 files changed, 4 insertions, 4 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 5aa604aebc7..5da1bb7b6c6 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,7 @@
12007-12-29 Richard Stallman <rms@gnu.org> 12007-12-29 Richard Stallman <rms@gnu.org>
2 2
3 * faces.el (facep): Doc fix.
4
3 * startup.el (fancy-startup-tail, fancy-about-text) 5 * startup.el (fancy-startup-tail, fancy-about-text)
4 (fancy-startup-text): Regularize format of face property. 6 (fancy-startup-text): Regularize format of face property.
5 7
diff --git a/lisp/faces.el b/lisp/faces.el
index a1b069e9ba6..ed319b77b08 100644
--- a/lisp/faces.el
+++ b/lisp/faces.el
@@ -206,10 +206,8 @@ The optional argument FRAME is ignored."
206;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; 206;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
207 207
208(defun facep (face) 208(defun facep (face)
209 "Return non-nil if FACE is a face name or internal face object. 209 "Return non-nil if FACE is a face name; nil otherwise.
210Return nil otherwise. A face name can be a string or a symbol. 210A face name can be a string or a symbol."
211An internal face object is a vector of the kind used internally
212to record face data."
213 (internal-lisp-face-p face)) 211 (internal-lisp-face-p face))
214 212
215 213