aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChong Yidong2012-02-12 17:51:03 +0800
committerChong Yidong2012-02-12 17:51:03 +0800
commitfaccede13a670af32c47a7e1ab7635b6bf509474 (patch)
tree822310febf5daad66503a938773f2fcd7b862770
parentafd83bd1529031d2883602908e9d58efef0c1fd0 (diff)
downloademacs-faccede13a670af32c47a7e1ab7635b6bf509474.tar.gz
emacs-faccede13a670af32c47a7e1ab7635b6bf509474.zip
* debugging.texi (Debugger Commands): Continuing is now allowed for errors.
-rw-r--r--admin/FOR-RELEASE6
-rw-r--r--doc/lispref/ChangeLog5
-rw-r--r--doc/lispref/debugging.texi12
-rw-r--r--lisp/dired.el2
4 files changed, 13 insertions, 12 deletions
diff --git a/admin/FOR-RELEASE b/admin/FOR-RELEASE
index abe53ad0b0d..75103ff3cec 100644
--- a/admin/FOR-RELEASE
+++ b/admin/FOR-RELEASE
@@ -185,11 +185,11 @@ anti.texi
185back.texi 185back.texi
186backups.texi 186backups.texi
187buffers.texi 187buffers.texi
188commands.texi 188commands.texi cyd
189compile.texi cyd 189compile.texi cyd
190control.texi cyd 190control.texi cyd
191customize.texi cyd 191customize.texi cyd
192debugging.texi 192debugging.texi cyd
193display.texi 193display.texi
194edebug.texi 194edebug.texi
195elisp.texi 195elisp.texi
@@ -222,7 +222,7 @@ positions.texi
222processes.texi 222processes.texi
223searching.texi 223searching.texi
224sequences.texi cyd 224sequences.texi cyd
225streams.texi 225streams.texi cyd
226strings.texi cyd 226strings.texi cyd
227symbols.texi cyd 227symbols.texi cyd
228syntax.texi 228syntax.texi
diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog
index 146ff8b454d..c5848ca8b2d 100644
--- a/doc/lispref/ChangeLog
+++ b/doc/lispref/ChangeLog
@@ -1,3 +1,8 @@
12012-02-12 Chong Yidong <cyd@gnu.org>
2
3 * debugging.texi (Debugger Commands): Continuing is now allowed
4 for errors.
5
12012-02-11 Chong Yidong <cyd@gnu.org> 62012-02-11 Chong Yidong <cyd@gnu.org>
2 7
3 * display.texi (Fringe Indicators): Add xref to Fringe Bitmaps. 8 * display.texi (Fringe Indicators): Add xref to Fringe Bitmaps.
diff --git a/doc/lispref/debugging.texi b/doc/lispref/debugging.texi
index db5e4279dc7..6e7d0078e07 100644
--- a/doc/lispref/debugging.texi
+++ b/doc/lispref/debugging.texi
@@ -370,14 +370,10 @@ to step through a primitive function.
370 370
371@table @kbd 371@table @kbd
372@item c 372@item c
373Exit the debugger and continue execution. When continuing is possible, 373Exit the debugger and continue execution. This resumes execution of
374it resumes execution of the program as if the debugger had never been 374the program as if the debugger had never been entered (aside from any
375entered (aside from any side-effects that you caused by changing 375side-effects that you caused by changing variable values or data
376variable values or data structures while inside the debugger). 376structures while inside the debugger).
377
378Continuing is possible after entry to the debugger due to function entry
379or exit, explicit invocation, or quitting. You cannot continue if the
380debugger was entered because of an error.
381 377
382@item d 378@item d
383Continue execution, but enter the debugger the next time any Lisp 379Continue execution, but enter the debugger the next time any Lisp
diff --git a/lisp/dired.el b/lisp/dired.el
index 3962ef14aa4..b683cb15b88 100644
--- a/lisp/dired.el
+++ b/lisp/dired.el
@@ -4196,7 +4196,7 @@ instead.
4196;;;*** 4196;;;***
4197 4197
4198;;;### (autoloads (dired-do-relsymlink dired-jump-other-window dired-jump) 4198;;;### (autoloads (dired-do-relsymlink dired-jump-other-window dired-jump)
4199;;;;;; "dired-x" "dired-x.el" "8d995933a8d82be3a8662d7eff7543cc") 4199;;;;;; "dired-x" "dired-x.el" "bc516591d881911d72b58eeed8816576")
4200;;; Generated autoloads from dired-x.el 4200;;; Generated autoloads from dired-x.el
4201 4201
4202(autoload 'dired-jump "dired-x" "\ 4202(autoload 'dired-jump "dired-x" "\