summaryrefslogtreecommitdiff
path: root/lisp
diff options
context:
space:
mode:
authorChong Yidong <cyd@stupidchicken.com>2005-12-17 15:45:55 +0000
committerChong Yidong <cyd@stupidchicken.com>2005-12-17 15:45:55 +0000
commit14e7cb9400b89584be38d800f8af8db0b2d1c0ff (patch)
tree5928a35e725bd8aa8de9028c7b502c39b2d3bef7 /lisp
parentd912b87a547063843528184f22b5d6fc9d35d192 (diff)
downloademacs-14e7cb9400b89584be38d800f8af8db0b2d1c0ff.tar.gz
* emacs-lisp/edebug.el (edebug-safe-prin1-to-string): Capture
error from printing circular structures.
Diffstat (limited to 'lisp')
-rw-r--r--lisp/ChangeLog5
-rw-r--r--lisp/emacs-lisp/edebug.el4
2 files changed, 8 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 20369d7a331..65961284484 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2005-12-17 Chong Yidong <cyd@stupidchicken.com>
+
+ * emacs-lisp/edebug.el (edebug-safe-prin1-to-string): Capture
+ error from printing circular structures.
+
2005-12-17 Martin Rudalics <rudalics@gmx.at> (tiny change)
* wid-edit.el (widget-checkbox-action): Clear undo info.
diff --git a/lisp/emacs-lisp/edebug.el b/lisp/emacs-lisp/edebug.el
index 01f1d760109..9290ede2bdf 100644
--- a/lisp/emacs-lisp/edebug.el
+++ b/lisp/emacs-lisp/edebug.el
@@ -3711,7 +3711,9 @@ Return the result of the last expression."
(print-level (or edebug-print-level print-level))
(print-circle (or edebug-print-circle print-circle))
(print-readably nil)) ;; lemacs uses this.
- (edebug-prin1-to-string value)))
+ (condition-case nil
+ (edebug-prin1-to-string value)
+ (error "#Apparently circular structure#"))))
(defun edebug-compute-previous-result (edebug-previous-value)
(if edebug-unwrap-results