aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGerd Moellmann2001-09-04 13:17:56 +0000
committerGerd Moellmann2001-09-04 13:17:56 +0000
commit1672462f74f765e468a429f700cae2a1168e19af (patch)
treef84f9675a273af0ba0bc1b7af28475db7c00bad3
parente73c5b91dfae1512bbc407041a5de649681ecee1 (diff)
downloademacs-1672462f74f765e468a429f700cae2a1168e19af.tar.gz
emacs-1672462f74f765e468a429f700cae2a1168e19af.zip
(bookmark-write-file): Bind print-length and
print-level to nil. From Tom Capey <tomc@edina.co.uk>.
-rw-r--r--lisp/ChangeLog3
-rw-r--r--lisp/bookmark.el31
2 files changed, 19 insertions, 15 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index e31f15b90d8..8b43798e843 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,8 @@
12001-09-04 Gerd Moellmann <gerd@gnu.org> 12001-09-04 Gerd Moellmann <gerd@gnu.org>
2 2
3 * bookmark.el (bookmark-write-file): Bind print-length and
4 print-level to nil. From Tom Capey <tomc@edina.co.uk>.
5
3 * obsolete/uncompress.el: Moved there from lisp/. 6 * obsolete/uncompress.el: Moved there from lisp/.
4 7
5 * comint.el (comint-insert-clicked-input): Goto point-max before 8 * comint.el (comint-insert-clicked-input): Goto point-max before
diff --git a/lisp/bookmark.el b/lisp/bookmark.el
index be0406610cb..6ac3c0f9d9a 100644
--- a/lisp/bookmark.el
+++ b/lisp/bookmark.el
@@ -1347,21 +1347,22 @@ for a file, defaulting to the file defined by variable
1347 (set-buffer (let ((enable-local-variables nil)) 1347 (set-buffer (let ((enable-local-variables nil))
1348 (find-file-noselect file))) 1348 (find-file-noselect file)))
1349 (goto-char (point-min)) 1349 (goto-char (point-min))
1350 (delete-region (point-min) (point-max)) 1350 (let ((print-length nil)
1351 (bookmark-insert-file-format-version-stamp) 1351 (print-level nil))
1352 (pp bookmark-alist (current-buffer)) 1352 (delete-region (point-min) (point-max))
1353 (let ((version-control 1353 (bookmark-insert-file-format-version-stamp)
1354 (cond 1354 (pp bookmark-alist (current-buffer))
1355 ((null bookmark-version-control) nil) 1355 (let ((version-control
1356 ((eq 'never bookmark-version-control) 'never) 1356 (cond
1357 ((eq 'nospecial bookmark-version-control) version-control) 1357 ((null bookmark-version-control) nil)
1358 (t 1358 ((eq 'never bookmark-version-control) 'never)
1359 t)))) 1359 ((eq 'nospecial bookmark-version-control) version-control)
1360 (write-file file) 1360 (t
1361 (kill-buffer (current-buffer)) 1361 t))))
1362 (if (>= baud-rate 9600) 1362 (write-file file)
1363 (message "Saving bookmarks to file %s...done" file)) 1363 (kill-buffer (current-buffer))
1364 )))) 1364 (if (>= baud-rate 9600)
1365 (message "Saving bookmarks to file %s...done" file)))))))
1365 1366
1366 1367
1367(defun bookmark-import-new-list (new-list) 1368(defun bookmark-import-new-list (new-list)