diff options
author | Eli Zaretskii <eliz@gnu.org> | 2020-12-09 17:17:09 +0200 |
---|---|---|
committer | Eli Zaretskii <eliz@gnu.org> | 2020-12-09 17:17:09 +0200 |
commit | b3d21dcd72fdd05b7884b206813e80127dcac9fe (patch) | |
tree | cfc51f2dc98c9f6e8903cc9efd299de2dbfdf622 | |
parent | beebd2a85eeab5b977ca2de8ad32784f9d8bdd51 (diff) | |
download | emacs-b3d21dcd72fdd05b7884b206813e80127dcac9fe.tar.gz |
Update docs of 'defvar' and 'defface'
* doc/lispref/display.texi (Defining Faces):
* doc/lispref/variables.texi (Defining Variables): Update the
descriptions of 'defvar' and 'defface' per recent changes in
'eval-last-sexp'. (Bug#45125)
-rw-r--r-- | doc/lispref/display.texi | 8 | ||||
-rw-r--r-- | doc/lispref/variables.texi | 10 |
2 files changed, 11 insertions, 7 deletions
diff --git a/doc/lispref/display.texi b/doc/lispref/display.texi index f86baf59360..ed26ae88087 100644 --- a/doc/lispref/display.texi +++ b/doc/lispref/display.texi @@ -2632,10 +2632,12 @@ appearance of @var{face} will again be determined by its default face spec. @cindex @code{eval-defun}, and @code{defface} forms +@cindex @code{eval-last-sexp}, and @code{defface} forms As an exception, if 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 custom face specs on the face, -causing the face to reflect exactly what the @code{defface} says. +@kbd{C-M-x} (@code{eval-defun}) or with @kbd{C-x C-e} +(@code{eval-last-sexp}) in Emacs Lisp mode, a special feature of these +commands overrides any custom face specs on the face, causing the face +to reflect exactly what the @code{defface} says. The @var{spec} argument is a @dfn{face spec}, which states how the face should appear on different kinds of terminals. It should be an diff --git a/doc/lispref/variables.texi b/doc/lispref/variables.texi index 095ea9dce24..b9ff0747382 100644 --- a/doc/lispref/variables.texi +++ b/doc/lispref/variables.texi @@ -481,10 +481,12 @@ form occurs in a @code{let} form with lexical binding enabled), then effect until its binding construct exits. @xref{Variable Scoping}. @cindex @code{eval-defun}, and @code{defvar} forms -When you evaluate a top-level @code{defvar} form with @kbd{C-M-x} in -Emacs Lisp mode (@code{eval-defun}), a special feature of -@code{eval-defun} arranges to set the variable unconditionally, without -testing whether its value is void. +@cindex @code{eval-last-sexp}, and @code{defvar} forms +When you evaluate a top-level @code{defvar} form with @kbd{C-M-x} +(@code{eval-defun}) or with @kbd{C-x C-e} (@code{eval-last-sexp}) in +Emacs Lisp mode, a special feature of these two commands arranges to +set the variable unconditionally, without testing whether its value is +void. If the @var{doc-string} argument is supplied, it specifies the documentation string for the variable (stored in the symbol's |