changeset 67635:70e76c30ddcc

* emacs-lisp/edebug.el (edebug-safe-prin1-to-string): Capture error from printing circular structures.
author Chong Yidong <cyd@stupidchicken.com>
date Sat, 17 Dec 2005 15:45:55 +0000
parents 83c53d29eff4
children b40bbd9c913a
files lisp/ChangeLog lisp/emacs-lisp/edebug.el
diffstat 2 files changed, 8 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/lisp/ChangeLog	Sat Dec 17 15:14:03 2005 +0000
+++ b/lisp/ChangeLog	Sat Dec 17 15:45:55 2005 +0000
@@ -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.
--- a/lisp/emacs-lisp/edebug.el	Sat Dec 17 15:14:03 2005 +0000
+++ b/lisp/emacs-lisp/edebug.el	Sat Dec 17 15:45:55 2005 +0000
@@ -3711,7 +3711,9 @@
 	(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