diff options
| author | Chong Yidong | 2007-04-06 18:35:23 +0000 |
|---|---|---|
| committer | Chong Yidong | 2007-04-06 18:35:23 +0000 |
| commit | c5c1022d716570d69d215506a8b4347edcd07d1b (patch) | |
| tree | 75232f783328b6597f7294dd60dd146318ce50d0 | |
| parent | b695d74bf859bde6fa7c88341c6f070477bedccb (diff) | |
| download | emacs-c5c1022d716570d69d215506a8b4347edcd07d1b.tar.gz emacs-c5c1022d716570d69d215506a8b4347edcd07d1b.zip | |
(desktop-create-buffer, desktop-save): Revert 2004-11-12 change.
| -rw-r--r-- | lisp/desktop.el | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/lisp/desktop.el b/lisp/desktop.el index 4328b8e3839..7b5db86f3cf 100644 --- a/lisp/desktop.el +++ b/lisp/desktop.el | |||
| @@ -782,7 +782,7 @@ See also `desktop-base-file-name'." | |||
| 782 | ";; Desktop file format version " desktop-file-version "\n" | 782 | ";; Desktop file format version " desktop-file-version "\n" |
| 783 | ";; Emacs version " emacs-version "\n\n" | 783 | ";; Emacs version " emacs-version "\n\n" |
| 784 | ";; Global section:\n") | 784 | ";; Global section:\n") |
| 785 | (mapc (function desktop-outvar) desktop-globals-to-save) | 785 | (mapcar (function desktop-outvar) desktop-globals-to-save) |
| 786 | (if (memq 'kill-ring desktop-globals-to-save) | 786 | (if (memq 'kill-ring desktop-globals-to-save) |
| 787 | (insert | 787 | (insert |
| 788 | "(setq kill-ring-yank-pointer (nthcdr " | 788 | "(setq kill-ring-yank-pointer (nthcdr " |
| @@ -790,7 +790,7 @@ See also `desktop-base-file-name'." | |||
| 790 | " kill-ring))\n")) | 790 | " kill-ring))\n")) |
| 791 | 791 | ||
| 792 | (insert "\n;; Buffer section -- buffers listed in same order as in buffer list:\n") | 792 | (insert "\n;; Buffer section -- buffers listed in same order as in buffer list:\n") |
| 793 | (mapc #'(lambda (l) | 793 | (mapcar #'(lambda (l) |
| 794 | (when (apply 'desktop-save-buffer-p l) | 794 | (when (apply 'desktop-save-buffer-p l) |
| 795 | (insert "(" | 795 | (insert "(" |
| 796 | (if (or (not (integerp eager)) | 796 | (if (or (not (integerp eager)) |
| @@ -801,7 +801,7 @@ See also `desktop-base-file-name'." | |||
| 801 | "desktop-append-buffer-args") | 801 | "desktop-append-buffer-args") |
| 802 | " " | 802 | " " |
| 803 | desktop-file-version) | 803 | desktop-file-version) |
| 804 | (mapc #'(lambda (e) | 804 | (mapcar #'(lambda (e) |
| 805 | (insert "\n " (desktop-value-to-string e))) | 805 | (insert "\n " (desktop-value-to-string e))) |
| 806 | l) | 806 | l) |
| 807 | (insert ")\n\n"))) | 807 | (insert ")\n\n"))) |
| @@ -1045,7 +1045,7 @@ directory DIRNAME." | |||
| 1045 | ((equal '(nil) desktop-buffer-minor-modes) ; backwards compatible | 1045 | ((equal '(nil) desktop-buffer-minor-modes) ; backwards compatible |
| 1046 | (auto-fill-mode 0)) | 1046 | (auto-fill-mode 0)) |
| 1047 | (t | 1047 | (t |
| 1048 | (mapc #'(lambda (minor-mode) | 1048 | (mapcar #'(lambda (minor-mode) |
| 1049 | ;; Give minor mode module a chance to add a handler. | 1049 | ;; Give minor mode module a chance to add a handler. |
| 1050 | (desktop-load-file minor-mode) | 1050 | (desktop-load-file minor-mode) |
| 1051 | (let ((handler (cdr (assq minor-mode desktop-minor-mode-handlers)))) | 1051 | (let ((handler (cdr (assq minor-mode desktop-minor-mode-handlers)))) |