diff options
| author | Chong Yidong <cyd@gnu.org> | 2012-09-21 11:03:48 +0800 |
|---|---|---|
| committer | Chong Yidong <cyd@gnu.org> | 2012-09-21 11:03:48 +0800 |
| commit | acfa068f4a1a4652b784af1d7aaac92929399249 (patch) | |
| tree | 4d5aef916164ae9862e4c94f50a5e53bbe274e53 /doc | |
| parent | eb2deaffd17e760b3ec945c58d43080e8a44767a (diff) | |
| parent | d3fa327c47570a1767324d23d710504e90b083f9 (diff) | |
| download | emacs-acfa068f4a1a4652b784af1d7aaac92929399249.tar.gz | |
Merge from emacs-24; up to 2012-05-07T14:57:18Z!michael.albinus@gmx.de
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/lispref/ChangeLog | 4 | ||||
| -rw-r--r-- | doc/lispref/debugging.texi | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog index 329c194f45a..6e4ffff3df6 100644 --- a/doc/lispref/ChangeLog +++ b/doc/lispref/ChangeLog @@ -1,3 +1,7 @@ +2012-09-12 Glenn Morris <rgm@gnu.org> + + * debugging.texi (Using Debugger): Fix typo. + 2012-09-18 Chong Yidong <cyd@gnu.org> * display.texi (Faces): Discuss anonymous faces. diff --git a/doc/lispref/debugging.texi b/doc/lispref/debugging.texi index 5aeff576d09..2226db942d1 100644 --- a/doc/lispref/debugging.texi +++ b/doc/lispref/debugging.texi @@ -331,7 +331,7 @@ variable is temporarily set according to non-@code{nil}, @code{debug-on-error} will temporarily be set to @code{t}. This means that any further errors that occur while doing a debugging session will (by default) trigger another backtrace. If -this is not want you want, you can either set +this is not what you want, you can either set @code{eval-expression-debug-on-error} to @code{nil}, or set @code{debug-on-error} to @code{nil} in @code{debugger-mode-hook}. |