Merge from emacs-24; up to 2012-05-07T14:57:18Z!michael.albinus@gmx.de

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}.