aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard M. Stallman2007-07-16 03:50:51 +0000
committerRichard M. Stallman2007-07-16 03:50:51 +0000
commitf6be091c471ba7a0c4b4f3e8ce851f96daae7bbe (patch)
tree0c137cb57ee356e553843cb3b059e7464fafc299
parentfae7f7ebd85c0c7d72c34b07c8deaee3cdd0d6c6 (diff)
downloademacs-f6be091c471ba7a0c4b4f3e8ce851f96daae7bbe.tar.gz
emacs-f6be091c471ba7a0c4b4f3e8ce851f96daae7bbe.zip
(Defining Faces): Fix previous change.
-rw-r--r--lispref/ChangeLog4
-rw-r--r--lispref/display.texi4
2 files changed, 6 insertions, 2 deletions
diff --git a/lispref/ChangeLog b/lispref/ChangeLog
index 0bd727f0748..61ee06011e6 100644
--- a/lispref/ChangeLog
+++ b/lispref/ChangeLog
@@ -1,3 +1,7 @@
12007-07-16 Richard Stallman <rms@gnu.org>
2
3 * display.texi (Defining Faces): Fix previous change.
4
12007-07-10 Richard Stallman <rms@gnu.org> 52007-07-10 Richard Stallman <rms@gnu.org>
2 6
3 * display.texi (Defining Faces): Explain C-M-x feature for defface. 7 * display.texi (Defining Faces): Explain C-M-x feature for defface.
diff --git a/lispref/display.texi b/lispref/display.texi
index 8cf25110308..cd46a0e72ba 100644
--- a/lispref/display.texi
+++ b/lispref/display.texi
@@ -1760,10 +1760,10 @@ When @code{defface} executes, it defines the face according to
1760@var{spec}, then uses any customizations that were read from the 1760@var{spec}, then uses any customizations that were read from the
1761init file (@pxref{Init File}) to override that specification. 1761init file (@pxref{Init File}) to override that specification.
1762 1762
1763When you evaluate a @code{defcustom} form with @kbd{C-M-x} in Emacs 1763When you evaluate a @code{defface} form with @kbd{C-M-x} in Emacs
1764Lisp mode (@code{eval-defun}), a special feature of @code{eval-defun} 1764Lisp mode (@code{eval-defun}), a special feature of @code{eval-defun}
1765overrides any customizations of the face. This way, the face reflects 1765overrides any customizations of the face. This way, the face reflects
1766exactly what the @code{defcustom} says. 1766exactly what the @code{defface} says.
1767 1767
1768The purpose of @var{spec} is to specify how the face should appear on 1768The purpose of @var{spec} is to specify how the face should appear on
1769different kinds of terminals. It should be an alist whose elements 1769different kinds of terminals. It should be an alist whose elements