(desktop-save): Use with-temp-buffer.

2 files changed, 38 insertions, 38 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 252d6f96c08..7fe0f61d723 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,6 @@
+2006-05-13 Lars Hansen <larsh@soem.dk>
+        * desktop.el (desktop-save): Use with-temp-buffer.
+
 2006-05-12  Glenn Morris  <rgm@gnu.org>
 
         * calendar/appt.el (appt-check, appt-make-list): Refer to
diff --git a/lisp/desktop.el b/lisp/desktop.el
index f56e2204e78..ae9142b527a 100644
--- a/lisp/desktop.el
+++ b/lisp/desktop.el
@@ -763,45 +763,42 @@ See also `desktop-base-file-name'."
                         (setq locals (cdr locals)))
                       ll)))
               (buffer-list)))
-          (eager desktop-restore-eager)
-          (buf (get-buffer-create "*desktop*")))
-      (set-buffer buf)
-      (erase-buffer)
-
-      (insert
-        ";; -*- mode: emacs-lisp; coding: emacs-mule; -*-\n"
-        desktop-header
-        ";; Created " (current-time-string) "\n"
-        ";; Desktop file format version " desktop-file-version "\n"
-        ";; Emacs version " emacs-version "\n\n"
-        ";; Global section:\n")
-      (mapc (function desktop-outvar) desktop-globals-to-save)
-      (if (memq 'kill-ring desktop-globals-to-save)
+          (eager desktop-restore-eager))
+      (with-temp-buffer
         (insert
-          "(setq kill-ring-yank-pointer (nthcdr "
-          (int-to-string (- (length kill-ring) (length kill-ring-yank-pointer)))
-          " kill-ring))\n"))
-
-      (insert "\n;; Buffer section -- buffers listed in same order as in buffer list:\n")
-      (mapc #'(lambda (l)
-                (when (apply 'desktop-save-buffer-p l)
-                  (insert "("
-                          (if (or (not (integerp eager))
-                                  (unless (zerop eager)
-                                    (setq eager (1- eager))
-                                    t))
-                              "desktop-create-buffer"
-                            "desktop-append-buffer-args")
-                          " "
-                          desktop-file-version)
-                  (mapc #'(lambda (e)
-                            (insert "\n  " (desktop-value-to-string e)))
-                        l)
-                  (insert ")\n\n")))
-            info)
-      (setq default-directory dirname)
-      (let ((coding-system-for-write 'emacs-mule))
-        (write-region (point-min) (point-max) filename nil 'nomessage))))
+         ";; -*- mode: emacs-lisp; coding: emacs-mule; -*-\n"
+         desktop-header
+         ";; Created " (current-time-string) "\n"
+         ";; Desktop file format version " desktop-file-version "\n"
+         ";; Emacs version " emacs-version "\n\n"
+         ";; Global section:\n")
+        (mapc (function desktop-outvar) desktop-globals-to-save)
+        (if (memq 'kill-ring desktop-globals-to-save)
+            (insert
+             "(setq kill-ring-yank-pointer (nthcdr "
+             (int-to-string (- (length kill-ring) (length kill-ring-yank-pointer)))
+             " kill-ring))\n"))
+
+        (insert "\n;; Buffer section -- buffers listed in same order as in buffer list:\n")
+        (mapc #'(lambda (l)
+                  (when (apply 'desktop-save-buffer-p l)
+                    (insert "("
+                            (if (or (not (integerp eager))
+                                    (unless (zerop eager)
+                                      (setq eager (1- eager))
+                                      t))
+                                "desktop-create-buffer"
+                              "desktop-append-buffer-args")
+                            " "
+                            desktop-file-version)
+                    (mapc #'(lambda (e)
+                              (insert "\n  " (desktop-value-to-string e)))
+                          l)
+                    (insert ")\n\n")))
+              info)
+        (setq default-directory dirname)
+        (let ((coding-system-for-write 'emacs-mule))
+          (write-region (point-min) (point-max) filename nil 'nomessage)))))
   (setq desktop-dirname dirname))
 
 ;; ----------------------------------------------------------------------------