diff options
| -rw-r--r-- | lisp/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/emacs-lisp/lisp-mode.el | 4 |
2 files changed, 8 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 87e471753e5..dcdb04cc5fa 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2007-07-10 Richard Stallman <rms@gnu.org> | ||
| 2 | |||
| 3 | * emacs-lisp/lisp-mode.el (eval-defun): | ||
| 4 | Explain special handling of `defface'. | ||
| 5 | |||
| 1 | 2007-07-09 Richard Stallman <rms@gnu.org> | 6 | 2007-07-09 Richard Stallman <rms@gnu.org> |
| 2 | 7 | ||
| 3 | * isearch.el (isearch-edit-string): Call to isearch-push-state | 8 | * isearch.el (isearch-edit-string): Call to isearch-push-state |
diff --git a/lisp/emacs-lisp/lisp-mode.el b/lisp/emacs-lisp/lisp-mode.el index 73379a816d7..374d3ae2327 100644 --- a/lisp/emacs-lisp/lisp-mode.el +++ b/lisp/emacs-lisp/lisp-mode.el | |||
| @@ -730,7 +730,9 @@ If the current defun is actually a call to `defvar' or `defcustom', | |||
| 730 | evaluating it this way resets the variable using its initial value | 730 | evaluating it this way resets the variable using its initial value |
| 731 | expression even if the variable already has some other value. | 731 | expression even if the variable already has some other value. |
| 732 | \(Normally `defvar' and `defcustom' do not alter the value if there | 732 | \(Normally `defvar' and `defcustom' do not alter the value if there |
| 733 | already is one.) | 733 | already is one.) In an analogous way, evaluating a `defface' |
| 734 | overrides any customizations of the face, so that it becomes | ||
| 735 | defined exactly as the `defface' expression says. | ||
| 734 | 736 | ||
| 735 | If `eval-expression-debug-on-error' is non-nil, which is the default, | 737 | If `eval-expression-debug-on-error' is non-nil, which is the default, |
| 736 | this command arranges for all errors to enter the debugger. | 738 | this command arranges for all errors to enter the debugger. |