[Emacs-diffs] /srv/bzr/emacs/trunk r110307: * lisp/bookmark.el (bookmark-write-file): Bind `print-circle' to `t'

[Karl Fogel]

------------------------------------------------------------
revno: 110307
committer: Karl Fogel <address@hidden>
branch nick: trunk
timestamp: Sun 2012-09-30 22:44:59 -0500
message:
  * lisp/bookmark.el (bookmark-write-file): Bind `print-circle' to `t'
    here to allow circular custom bookmark types.  (Bug#12503)
modified:
  lisp/ChangeLog
  lisp/bookmark.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2012-10-01 03:32:06 +0000
+++ b/lisp/ChangeLog    2012-10-01 03:44:59 +0000
@@ -2,6 +2,8 @@
 
        * bookmark.el (bookmark-version-control): Give tags in the
        :type choices (Bug#12309), and improve doc string.
+       (bookmark-write-file): Bind `print-circle' to `t' to allow
+       circular custom bookmark types.  (Bug#12503)
 
 2012-10-01  Paul Eggert  <address@hidden>
 

=== modified file 'lisp/bookmark.el'
--- a/lisp/bookmark.el  2012-10-01 03:34:02 +0000
+++ b/lisp/bookmark.el  2012-10-01 03:44:59 +0000
@@ -1359,7 +1359,12 @@
     (goto-char (point-min))
     (delete-region (point-min) (point-max))
     (let ((print-length nil)
-          (print-level nil))
+          (print-level nil)
+          ;; See bug #12503 for why we bind `print-circle'.  Users
+          ;; can define their own bookmark types, which can result in
+          ;; arbitrary Lisp objects being stored in bookmark records,
+          ;; and some users create objects containing circularities.
+          (print-circle t))
       (bookmark-insert-file-format-version-stamp)
       (insert "(")
       ;; Rather than a single call to `pp' we make one per bookmark.