aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKarl Fogel2012-09-30 22:44:59 -0500
committerKarl Fogel2012-09-30 22:44:59 -0500
commite4c4abdd81a0c58df8b00de73076994b33ee377d (patch)
treed49c29f6fbfb63233fce80fdba29e29e23461e70
parent9267dbfd62dee0795d76e4865b018a5263864d3c (diff)
downloademacs-e4c4abdd81a0c58df8b00de73076994b33ee377d.tar.gz
emacs-e4c4abdd81a0c58df8b00de73076994b33ee377d.zip
* lisp/bookmark.el (bookmark-write-file): Bind `print-circle' to `t'
here to allow circular custom bookmark types. (Bug#12503)
-rw-r--r--lisp/ChangeLog2
-rw-r--r--lisp/bookmark.el7
2 files changed, 8 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 7ac0ec72990..0e515c2a7b4 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -2,6 +2,8 @@
2 2
3 * bookmark.el (bookmark-version-control): Give tags in the 3 * bookmark.el (bookmark-version-control): Give tags in the
4 :type choices (Bug#12309), and improve doc string. 4 :type choices (Bug#12309), and improve doc string.
5 (bookmark-write-file): Bind `print-circle' to `t' to allow
6 circular custom bookmark types. (Bug#12503)
5 7
62012-10-01 Paul Eggert <eggert@cs.ucla.edu> 82012-10-01 Paul Eggert <eggert@cs.ucla.edu>
7 9
diff --git a/lisp/bookmark.el b/lisp/bookmark.el
index 3259d6283f9..ebb3aac3319 100644
--- a/lisp/bookmark.el
+++ b/lisp/bookmark.el
@@ -1359,7 +1359,12 @@ for a file, defaulting to the file defined by variable
1359 (goto-char (point-min)) 1359 (goto-char (point-min))
1360 (delete-region (point-min) (point-max)) 1360 (delete-region (point-min) (point-max))
1361 (let ((print-length nil) 1361 (let ((print-length nil)
1362 (print-level nil)) 1362 (print-level nil)
1363 ;; See bug #12503 for why we bind `print-circle'. Users
1364 ;; can define their own bookmark types, which can result in
1365 ;; arbitrary Lisp objects being stored in bookmark records,
1366 ;; and some users create objects containing circularities.
1367 (print-circle t))
1363 (bookmark-insert-file-format-version-stamp) 1368 (bookmark-insert-file-format-version-stamp)
1364 (insert "(") 1369 (insert "(")
1365 ;; Rather than a single call to `pp' we make one per bookmark. 1370 ;; Rather than a single call to `pp' we make one per bookmark.