(bookmark-write-file): Don't visit the destination file, just write

the data to it using write-region.  This is similar to 2005-05-29T08:36:26Z!rms@gnu.org
of saveplace.el, but with an additional change to avoid visiting the
file in the first place.

2 files changed, 10 insertions, 4 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index eca2a8f6b77..bc3bca39cc6 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,10 @@
+2005-11-12  Karl Fogel  <kfogel@red-bean.com>
+
+        * bookmark.el (bookmark-write-file): Don't visit the destination
+        file, just write the data to it using write-region.  This is
+        similar to saveplace.el at 2005-05-29T08:36:26Z!rms@gnu.org, but with an additional
+        change to avoid visiting the file in the first place.
+
 2005-11-12  Chong Yidong  <cyd@stupidchicken.com>
 
         * hi-lock.el (hi-lock-mode): Set the default value of
diff --git a/lisp/bookmark.el b/lisp/bookmark.el
index 86fa6e489f0..de1bb4f6a6c 100644
--- a/lisp/bookmark.el
+++ b/lisp/bookmark.el
@@ -1352,12 +1352,11 @@ for a file, defaulting to the file defined by variable
     (save-window-excursion
       (if (>= baud-rate 9600)
           (message "Saving bookmarks to file %s..." file))
-      (set-buffer (let ((enable-local-variables nil))
-                    (find-file-noselect file)))
+      (set-buffer (get-buffer-create " *Bookmarks*"))
       (goto-char (point-min))
+      (delete-region (point-min) (point-max))
       (let ((print-length nil)
             (print-level nil))
-        (delete-region (point-min) (point-max))
         (bookmark-insert-file-format-version-stamp)
         (pp bookmark-alist (current-buffer))
         (let ((version-control
@@ -1368,7 +1367,7 @@ for a file, defaulting to the file defined by variable
                 (t
                  t))))
           (condition-case nil
-              (write-file file)
+              (write-region (point-min) (point-max) file)
             (file-error (message "Can't write %s" file)))
           (kill-buffer (current-buffer))
           (if (>= baud-rate 9600)