Merge changes from emacs-23 branch

[bpt/emacs.git] / doc / lispref / edebug.texi

diff --git a/doc/lispref/edebug.texi b/doc/lispref/edebug.texi
index c68b342..391c22b 100644 (file)
--- a/doc/lispref/edebug.texi
+++ b/doc/lispref/edebug.texi
@@ -1,7 +1,6 @@
 @comment -*-texinfo-*-
 @c This is part of the GNU Emacs Lisp Reference Manual.
-@c Copyright (C) 1992, 1993, 1994, 1998, 1999, 2001, 2002, 2003, 2004,
-@c   2005, 2006, 2007, 2008, 2009, 2010  Free Software Foundation, Inc.
+@c Copyright (C) 1992-1994, 1998-1999, 2001-2011  Free Software Foundation, Inc.
 @c See the file elisp.texi for copying conditions.
 
 @c This file can also be used by an independent Edebug User
@@ -59,24 +58,24 @@ The first three sections below should tell you enough about Edebug to
 start using it.
 
 @menu
-* Using Edebug::               Introduction to use of Edebug.
-* Instrumenting::              You must instrument your code
-                                 in order to debug it with Edebug.
+* Using Edebug::                Introduction to use of Edebug.
+* Instrumenting::               You must instrument your code
+                                  in order to debug it with Edebug.
 * Modes: Edebug Execution Modes. Execution modes, stopping more or less often.
-* Jumping::                    Commands to jump to a specified place.
-* Misc: Edebug Misc.           Miscellaneous commands.
+* Jumping::                     Commands to jump to a specified place.
+* Misc: Edebug Misc.            Miscellaneous commands.
 * Breaks::                      Setting breakpoints to make the program stop.
-* Trapping Errors::            Trapping errors with Edebug.
-* Views: Edebug Views.         Views inside and outside of Edebug.
-* Eval: Edebug Eval.           Evaluating expressions within Edebug.
-* Eval List::                  Expressions whose values are displayed
-                                 each time you enter Edebug.
-* Printing in Edebug::         Customization of printing.
-* Trace Buffer::               How to produce trace output in a buffer.
-* Coverage Testing::           How to test evaluation coverage.
-* The Outside Context::                Data that Edebug saves and restores.
-* Edebug and Macros::          Specifying how to handle macro calls.
-* Options: Edebug Options.     Option variables for customizing Edebug.
+* Trapping Errors::             Trapping errors with Edebug.
+* Views: Edebug Views.          Views inside and outside of Edebug.
+* Eval: Edebug Eval.            Evaluating expressions within Edebug.
+* Eval List::                   Expressions whose values are displayed
+                                  each time you enter Edebug.
+* Printing in Edebug::          Customization of printing.
+* Trace Buffer::                How to produce trace output in a buffer.
+* Coverage Testing::            How to test evaluation coverage.
+* The Outside Context::         Data that Edebug saves and restores.
+* Edebug and Macros::           Specifying how to handle macro calls.
+* Options: Edebug Options.      Option variables for customizing Edebug.
 @end menu
 
 @node Using Edebug
@@ -186,7 +185,7 @@ instrument any top-level form regardless of the values of
 
   While Edebug is active, the command @kbd{I}
 (@code{edebug-instrument-callee}) instruments the definition of the
-function or macro called by the list form after point, if is not already
+function or macro called by the list form after point, if it is not already
 instrumented.  This is possible only if Edebug knows where to find the
 source for that function; for this reason, after loading Edebug,
 @code{eval-region} records the position of every definition it
@@ -429,8 +428,8 @@ breakpoints, the global break condition, and source breakpoints.
 
 @menu
 * Breakpoints::                 Breakpoints at stop points.
-* Global Break Condition::     Breaking on an event.
-* Source Breakpoints::         Embedding breakpoints in source code.
+* Global Break Condition::      Breaking on an event.
+* Source Breakpoints::          Embedding breakpoints in source code.
 @end menu
 
 @node Breakpoints
@@ -940,9 +939,9 @@ explains precisely what context Edebug restores, and how Edebug fails to
 be completely transparent.
 
 @menu
-* Checking Whether to Stop::   When Edebug decides what to do.
-* Edebug Display Update::      When Edebug updates the display.
-* Edebug Recursive Edit::      When Edebug stops execution.
+* Checking Whether to Stop::    When Edebug decides what to do.
+* Edebug Display Update::       When Edebug updates the display.
+* Edebug Recursive Edit::       When Edebug stops execution.
 @end menu
 
 @node Checking Whether to Stop
@@ -1074,9 +1073,9 @@ extra care is needed.  This subsection explains the details.
 
 @menu
 * Instrumenting Macro Calls::   The basic problem.
-* Specification List::         How to specify complex patterns of evaluation.
-* Backtracking::               What Edebug does when matching fails.
-* Specification Examples::     To help understand specifications.
+* Specification List::          How to specify complex patterns of evaluation.
+* Backtracking::                What Edebug does when matching fails.
+* Specification Examples::      To help understand specifications.
 @end menu
 
 @node Instrumenting Macro Calls
@@ -1588,7 +1587,3 @@ If non-@code{nil}, an expression to test for at every stop point.  If
 the result is non-@code{nil}, then break.  Errors are ignored.
 @xref{Global Break Condition}.
 @end defopt
-
-@ignore
-   arch-tag: 74842db8-019f-4818-b5a4-b2de878e57fd
-@end ignore