aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKarl Fogel2005-04-11 01:18:35 +0000
committerKarl Fogel2005-04-11 01:18:35 +0000
commit9552bee8c6e7c5ee16ca60cddebaebdf5d238e05 (patch)
tree6f2b1802782d5dc12bd9dd92f8723a56a6bcbfa1
parent6695c528d4bf53c198befee30831b0e67c1c32d5 (diff)
downloademacs-9552bee8c6e7c5ee16ca60cddebaebdf5d238e05.tar.gz
emacs-9552bee8c6e7c5ee16ca60cddebaebdf5d238e05.zip
(bookmark-write-file): Catch errors writing file.
This is the same change as saveplace.el at 2005-04-10T23:32:00Z!rms@gnu.org.
-rw-r--r--lisp/ChangeLog5
-rw-r--r--lisp/bookmark.el4
2 files changed, 8 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 1ddf9f5594c..c299c1cf77f 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
12005-04-10 Karl Fogel <kfogel@red-bean.com>
2
3 * bookmark.el (bookmark-write-file): Catch errors writing file.
4 This is the same change as saveplace.el at 2005-04-10T23:32:00Z!rms@gnu.org.
5
12005-04-10 Richard M. Stallman <rms@gnu.org> 62005-04-10 Richard M. Stallman <rms@gnu.org>
2 7
3 * startup.el (fancy-splash-tail): Update copyright year. 8 * startup.el (fancy-splash-tail): Update copyright year.
diff --git a/lisp/bookmark.el b/lisp/bookmark.el
index 869896b087a..0696f929584 100644
--- a/lisp/bookmark.el
+++ b/lisp/bookmark.el
@@ -1355,7 +1355,9 @@ for a file, defaulting to the file defined by variable
1355 ((eq 'nospecial bookmark-version-control) version-control) 1355 ((eq 'nospecial bookmark-version-control) version-control)
1356 (t 1356 (t
1357 t)))) 1357 t))))
1358 (write-file file) 1358 (condition-case nil
1359 (write-file file)
1360 (file-error (message "Can't write %s" file)))
1359 (kill-buffer (current-buffer)) 1361 (kill-buffer (current-buffer))
1360 (if (>= baud-rate 9600) 1362 (if (>= baud-rate 9600)
1361 (message "Saving bookmarks to file %s...done" file))))))) 1363 (message "Saving bookmarks to file %s...done" file)))))))