(Marking Objects): `M-h' accepts prefix arg.

[gnu-emacs] / lisp / desktop.el

diff --git a/lisp/desktop.el b/lisp/desktop.el
index 95ae3c91040b696f9cc06e44730ad38043fcd533..e9791cc0f90d3c7e23d4f2aedb71c5ee93d7d3b5 100644 (file)
--- a/lisp/desktop.el
+++ b/lisp/desktop.el
@@ -1,6 +1,7 @@
 ;;; desktop.el --- save partial status of Emacs when killed
 
-;; Copyright (C) 1993, 1994, 1995, 1997, 2000 Free Software Foundation, Inc.
+;; Copyright (C) 1993, 1994, 1995, 1997, 2000, 2001
+;;   Free Software Foundation, Inc.
 
 ;; Author: Morten Welinder <terra@diku.dk>
 ;; Keywords: convenience
@@ -474,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
@@ -521,7 +521,8 @@ MODE is the major mode."
       (set-buffer buf)
       (erase-buffer)
 
-      (insert desktop-header
+      (insert ";; -*- coding: emacs-mule; -*-\n"
+             desktop-header
              ";; Created " (current-time-string) "\n"
              ";; Emacs version " emacs-version "\n\n"
              ";; Global section:\n")
@@ -547,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 ()
@@ -574,9 +576,17 @@ This is a no-op when Emacs is running in batch mode."
        (setq dirs (cdr dirs)))
       (setq desktop-dirname (and dirs (expand-file-name (car dirs))))
       (if desktop-dirname
-         (progn
+         (let ((desktop-last-buffer nil))
+           ;; `load-with-code-conversion' calls `eval-buffer' which
+           ;; contains a `save-excursion', so we end up with the same
+           ;; buffer before and after the load.  This is a problem
+           ;; when the desktop is read initially when Emacs starts up
+           ;; because, if we still are in *scratch* after running
+           ;; `after-init-hook', the splash screen will be displayed.
            (load (expand-file-name desktop-basefilename desktop-dirname)
                  t t t)
+           (when desktop-last-buffer
+             (switch-to-buffer desktop-last-buffer))
            (run-hooks 'desktop-delay-hook)
            (setq desktop-delay-hook nil)
            (message "Desktop loaded."))
@@ -664,6 +674,10 @@ to provide correct modes for autoloaded files."
 ;; ----------------------------------------------------------------------------
 ;; Create a buffer, load its file, set is mode, ...;  called from Desktop file
 ;; only.
+
+(defvar desktop-last-buffer nil
+  "Last buffer read.  Dynamically bound in `desktop-read'.")
+
 (defun desktop-create-buffer (ver desktop-buffer-file-name desktop-buffer-name
                                  desktop-buffer-major-mode
                                  mim pt mk ro desktop-buffer-misc
@@ -676,6 +690,7 @@ to provide correct modes for autoloaded files."
       (setq result (funcall handler))
       (setq hlist (cdr hlist)))
     (when (bufferp result)
+      (setq desktop-last-buffer result)
       (set-buffer result)
       (if (not (equal (buffer-name) desktop-buffer-name))
          (rename-buffer desktop-buffer-name))
@@ -683,10 +698,9 @@ to provide correct modes for autoloaded files."
       (cond ((equal '(t) mim)   (auto-fill-mode 1))    ; backwards compatible
            ((equal '(nil) mim) (auto-fill-mode 0))
            (t (mapcar #'(lambda (minor-mode)
-                          (unless (or (eq minor-mode t) (eq minor-mode nil))
-                            (if (and minor-mode (fboundp minor-mode))
-                                (funcall minor-mode 1))))
-                          mim)))
+                          (when (functionp minor-mode)
+                            (funcall minor-mode 1)))
+                      mim)))
       (goto-char pt)
       (if (consp mk)
          (progn