summaryrefslogtreecommitdiff
path: root/doc/lispref/display.texi
diff options
context:
space:
mode:
authorMiles Bader <miles@gnu.org>2008-01-08 20:46:54 +0000
committerMiles Bader <miles@gnu.org>2008-01-08 20:46:54 +0000
commit59ce725a3b68cbc324f01bc8dc5f9e07286431d1 (patch)
treec17b8f002edf6892e273ff53214b1b23c880e69f /doc/lispref/display.texi
parent0664ff722152f34c2e87e9e644bbab401530b9d4 (diff)
parentbf515869577b12abd42777fb0647259920c862fc (diff)
downloademacs-59ce725a3b68cbc324f01bc8dc5f9e07286431d1.tar.gz
Merge from emacs--rel--22
Revision: emacs@sv.gnu.org/emacs--devo--0--patch-987
Diffstat (limited to 'doc/lispref/display.texi')
-rw-r--r--doc/lispref/display.texi5
1 files changed, 2 insertions, 3 deletions
diff --git a/doc/lispref/display.texi b/doc/lispref/display.texi
index 165636006d3..b56d24da64e 100644
--- a/doc/lispref/display.texi
+++ b/doc/lispref/display.texi
@@ -1,7 +1,7 @@
@c -*-texinfo-*-
@c This is part of the GNU Emacs Lisp Reference Manual.
@c Copyright (C) 1990, 1991, 1992, 1993, 1994, 1995, 1998, 1999, 2000, 2001,
-@c 2002, 2003, 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
+@c 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
@c See the file elisp.texi for copying conditions.
@setfilename ../../info/display
@node Display, System Interface, Processes, Top
@@ -1744,8 +1744,7 @@ faces in Lisp programs by the symbols that name them.
@defun facep object
This function returns @code{t} if @var{object} is a face name string
-or symbol (or if it is a vector of the kind used internally to record
-face data). It returns @code{nil} otherwise.
+or symbol. It returns @code{nil} otherwise.
@end defun
Each face name is meaningful for all frames, and by default it has the