Merge from emacs--devo--0

[gnu-emacs] / lisp / desktop.el

diff --git a/lisp/desktop.el b/lisp/desktop.el
index 442c81bf730d2b376b10c816c0eca63780671868..12cd378f0f41194e98027c2eec92503ba90bb462 100644 (file)
--- a/lisp/desktop.el
+++ b/lisp/desktop.el
@@ -776,40 +776,40 @@ See also `desktop-base-file-name'."
               (buffer-list)))
           (eager desktop-restore-eager))
       (with-temp-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)
-            (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)))))
+       (insert
+         ";; -*- mode: emacs-lisp; coding: utf-8-emacs; -*-\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 'utf-8-emacs))
+         (write-region (point-min) (point-max) filename nil 'nomessage)))))
   (setq desktop-dirname dirname))
 
 ;; ----------------------------------------------------------------------------