Changeset 4200 for trunk/lisp/desktop.el

Timestamp:

2007年04月07日 15時49分28秒 (2 years ago)

Author:

miyoshi

Message:

Sync up with Emacs CVS HEAD.

Files:

• trunk/lisp/desktop.el (modified) (4 diffs)

trunk/lisp/desktop.el

@@ -783 +783 @@
-         ";; Emacs version " emacs-version "\n\n"
-         ";; Global section:\n")
-
+ar
-        (if (memq 'kill-ring desktop-globals-to-save)
-            (insert
@@ -791 +791 @@
-
-        (insert "\n;; Buffer section -- buffers listed in same order as in buffer list:\n")
-
+ar
-                  (when (apply 'desktop-save-buffer-p l)
-                    (insert "("
@@ -802 +802 @@
-                            " "
-                            desktop-file-version)
-
+ar
-                              (insert "\n  " (desktop-value-to-string e)))
-                          l)
@@ -1046 +1046 @@
-               (auto-fill-mode 0))
-              (t
-
+ar
-                         ;; Give minor mode module a chance to add a handler.
-                         (desktop-load-file minor-mode)