Mercurial > emacs
diff doc/lispref/display.texi @ 87649:107ccd98fa12
Merge from emacs--rel--22
Revision: emacs@sv.gnu.org/emacs--devo--0--patch-987
author | Miles Bader <miles@gnu.org> |
---|---|
date | Tue, 08 Jan 2008 20:46:54 +0000 |
parents | ec0ef12211d9 |
children | 36cc1038d878 |
line wrap: on
line diff
--- a/doc/lispref/display.texi Tue Jan 08 20:07:21 2008 +0000 +++ b/doc/lispref/display.texi Tue Jan 08 20:46:54 2008 +0000 @@ -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 @@ @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