aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGlenn Morris2012-02-04 13:58:00 -0800
committerGlenn Morris2012-02-04 13:58:00 -0800
commit7aa5aad87e3fcf57cfa5bacc38630048b9fc0295 (patch)
tree7f405589767d7b1052c35743cbe310a357e0ce20
parent1f5e1a1648da9f0e88926711dcede5cbd6330f7e (diff)
downloademacs-7aa5aad87e3fcf57cfa5bacc38630048b9fc0295.tar.gz
emacs-7aa5aad87e3fcf57cfa5bacc38630048b9fc0295.zip
Document debug-on-event
* doc/lispref/debugging.texi (Error Debugging): Mention debug-on-event. * doc/lispref/commands.texi (Misc Events): Mention sigusr1,2 and debugging. * etc/NEWS: Related edit.
-rw-r--r--doc/lispref/ChangeLog3
-rw-r--r--doc/lispref/commands.texi1
-rw-r--r--doc/lispref/debugging.texi9
-rw-r--r--etc/NEWS4
4 files changed, 16 insertions, 1 deletions
diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog
index 54dbdb9c9b2..459ccf63372 100644
--- a/doc/lispref/ChangeLog
+++ b/doc/lispref/ChangeLog
@@ -1,5 +1,8 @@
12012-02-04 Glenn Morris <rgm@gnu.org> 12012-02-04 Glenn Morris <rgm@gnu.org>
2 2
3 * debugging.texi (Error Debugging): Mention debug-on-event.
4 * commands.texi (Misc Events): Mention sigusr1,2 and debugging.
5
3 * modes.texi (Running Hooks): Try to clarify with-wrapper-hook. 6 * modes.texi (Running Hooks): Try to clarify with-wrapper-hook.
4 7
5 * text.texi (Buffer Contents): 8 * text.texi (Buffer Contents):
diff --git a/doc/lispref/commands.texi b/doc/lispref/commands.texi
index aff7a0c5f27..91e224a439f 100644
--- a/doc/lispref/commands.texi
+++ b/doc/lispref/commands.texi
@@ -1696,6 +1696,7 @@ parameters are used to display the help-echo text are described in
1696These events are generated when the Emacs process receives 1696These events are generated when the Emacs process receives
1697the signals @code{SIGUSR1} and @code{SIGUSR2}. They contain no 1697the signals @code{SIGUSR1} and @code{SIGUSR2}. They contain no
1698additional data because signals do not carry additional information. 1698additional data because signals do not carry additional information.
1699They can be useful for debugging (@pxref{Error Debugging}).
1699 1700
1700To catch a user signal, bind the corresponding event to an interactive 1701To catch a user signal, bind the corresponding event to an interactive
1701command in the @code{special-event-map} (@pxref{Active Keymaps}). 1702command in the @code{special-event-map} (@pxref{Active Keymaps}).
diff --git a/doc/lispref/debugging.texi b/doc/lispref/debugging.texi
index 9466f21a563..a17fc60718b 100644
--- a/doc/lispref/debugging.texi
+++ b/doc/lispref/debugging.texi
@@ -148,6 +148,15 @@ enter the debugger.
148@code{debug-on-error} is @code{nil}. 148@code{debug-on-error} is @code{nil}.
149@end defopt 149@end defopt
150 150
151@defopt debug-on-event
152If you set @code{debug-on-event} to a special event (@pxref{Special
153Events}), Emacs will try to enter the debugger as soon as it receives
154this event, bypassing @code{special-event-map}. At present, the only
155supported values correspond to the signals @code{SIGUSR1} and
156@code{SIGUSR2}. This can be helpful when @code{inhibit-quit} is set
157and Emacs is not otherwise responding.
158@end defopt
159
151 To debug an error that happens during loading of the init 160 To debug an error that happens during loading of the init
152file, use the option @samp{--debug-init}. This binds 161file, use the option @samp{--debug-init}. This binds
153@code{debug-on-error} to @code{t} while loading the init file, and 162@code{debug-on-error} to @code{t} while loading the init file, and
diff --git a/etc/NEWS b/etc/NEWS
index 1c9072d38af..67073cb1acf 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -1403,7 +1403,9 @@ as well as those in the -*- line.
1403 1403
1404** keymaps can inherit from multiple parents. 1404** keymaps can inherit from multiple parents.
1405 1405
1406** `debug-on-event' lets you debug Emacs when stuck because of inhibit-quit. 1406+++
1407** Set `debug-on-event' to make Emacs enter the debugger e.g. on receipt
1408of SIGUSR1. This can be useful when `inhibit-quit' is set.
1407 1409
1408+++ 1410+++
1409** New reader macro ## which stands for the empty symbol. 1411** New reader macro ## which stands for the empty symbol.