diff options
| author | Miles Bader <miles@gnu.org> | 2007-07-24 01:21:32 +0000 |
|---|---|---|
| committer | Miles Bader <miles@gnu.org> | 2007-07-24 01:21:32 +0000 |
| commit | 1e8995158740b15936887264a3d7183beb5c51d9 (patch) | |
| tree | cd8fc3c6fde54564cd5dbe15fccfc3c57b9ad270 /lispref | |
| parent | 26cc71affcdc326491cfd936c43eb90522a06ca0 (diff) | |
| parent | f931ce84da6a9515dc99f88beb0de3a4138cc1cd (diff) | |
| download | emacs-1e8995158740b15936887264a3d7183beb5c51d9.tar.gz | |
Merge from emacs--rel--22
Patches applied:
* emacs--rel--22 (patch 59-69)
- Update from CVS
- Merge from gnus--rel--5.10
* gnus--rel--5.10 (patch 237-238)
- Update from CVS
2007-07-23 Stefan Monnier <monnier@iro.umontreal.ca>
* lisp/ses.el (ses-cleanup): Prevent Emacs from spuriously checking if the
underlying file is uptodate.
2007-07-17 Dan Nicolaescu <dann@ics.uci.edu>
* lisp/vc.el: Add more info about the vc-registered function.
2007-07-15 Richard M. Stallman <rms@gnu.org>
* lisp/kmacro.el (kmacro-bind-to-key): Avoid comparisons on function keys.
* lisp/tutorial.el (tutorial--find-changed-keys):
Handle C-x specially like ESC.
2007-07-15 Aaron Hawley <aaronh@garden.org>
* lisp/tar-mode.el (tar-get-descriptor): No error for zero-length file.
2007-07-21 Reiner Steib <Reiner.Steib@gmx.de>
* lisp/gnus/mm-uu.el (mm-uu-type-alist): Refer to mm-uu-configure-list in doc
string.
2007-07-16 Katsumi Yamaoka <yamaoka@jpl.org>
* lisp/gnus/gnus-srvr.el (gnus-server-font-lock-keywords): Quote faces.
2007-07-16 Richard M. Stallman <rms@gnu.org>
* lispref/display.texi (Defining Faces): Fix previous change.
2007-07-20 Eli Zaretskii <eliz@gnu.org>
* src/w32proc.c (IMAGE_NT_OPTIONAL_HDR32_MAGIC, IMAGE_OPTIONAL_HEADER32):
Define if not defined.
2007-07-18 Jason Rumney <jasonr@gnu.org>
* src/w32proc.c (w32_executable_type): Handle 64 bit executables.
Revision: emacs@sv.gnu.org/emacs--devo--0--patch-823
Diffstat (limited to 'lispref')
| -rw-r--r-- | lispref/ChangeLog | 4 | ||||
| -rw-r--r-- | lispref/display.texi | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/lispref/ChangeLog b/lispref/ChangeLog index 5dc45b43b33..bc81ca4d4e7 100644 --- a/lispref/ChangeLog +++ b/lispref/ChangeLog @@ -3,6 +3,10 @@ * files.texi (Magic File Names): Introduce optional parameter IDENTIFICATION for `file-remote-p'. +2007-07-16 Richard Stallman <rms@gnu.org> + + * display.texi (Defining Faces): Fix previous change. + 2007-07-14 Richard Stallman <rms@gnu.org> * control.texi (Handling Errors): Document `debug' in handler list. diff --git a/lispref/display.texi b/lispref/display.texi index f4d7a5dbcdb..84c9ba84935 100644 --- a/lispref/display.texi +++ b/lispref/display.texi @@ -1760,10 +1760,10 @@ When @code{defface} executes, it defines the face according to @var{spec}, then uses any customizations that were read from the init file (@pxref{Init File}) to override that specification. -When you evaluate a @code{defcustom} form with @kbd{C-M-x} in Emacs +When you evaluate a @code{defface} form with @kbd{C-M-x} in Emacs Lisp mode (@code{eval-defun}), a special feature of @code{eval-defun} overrides any customizations of the face. This way, the face reflects -exactly what the @code{defcustom} says. +exactly what the @code{defface} says. The purpose of @var{spec} is to specify how the face should appear on different kinds of terminals. It should be an alist whose elements |