(exec-suffixes): Initialize to a system-dependent value.

[bpt/emacs.git] / lisp / desktop.el

diff --git a/lisp/desktop.el b/lisp/desktop.el
index 54a598d..4ccdaed 100644 (file)
--- a/lisp/desktop.el
+++ b/lisp/desktop.el
@@ -475,8 +475,7 @@ MODE is the major mode."
   (interactive "DDirectory to save desktop file in: ")
   (run-hooks 'desktop-save-hook)
   (save-excursion
-    (let ((filename (expand-file-name
-                    (concat dirname desktop-basefilename)))
+    (let ((filename (expand-file-name desktop-basefilename dirname))
          (info (nreverse
                 (mapcar
                  (function
@@ -522,8 +521,8 @@ MODE is the major mode."
       (set-buffer buf)
       (erase-buffer)
 
-      (insert desktop-header
-             ";; -*- coding: emacs-mule; -*-\n"
+      (insert ";; -*- coding: emacs-mule; -*-\n"
+             desktop-header
              ";; Created " (current-time-string) "\n"
              ";; Emacs version " emacs-version "\n\n"
              ";; Global section:\n")
@@ -549,7 +548,8 @@ MODE is the major mode."
        info)
       (setq default-directory dirname)
       (if (file-exists-p filename) (delete-file filename))
-      (write-region (point-min) (point-max) filename nil 'nomessage)))
+      (let ((coding-system-for-write 'emacs-mule))
+       (write-region (point-min) (point-max) filename nil 'nomessage))))
   (setq desktop-dirname dirname))
 ;; ----------------------------------------------------------------------------
 (defun desktop-remove ()