Mercurial > emacs
comparison lisp/desktop.el @ 76978:69597b621497
(desktop-create-buffer, desktop-save): Revert 2004-11-12 change.
| author | Chong Yidong <cyd@stupidchicken.com> |
|---|---|
| date | Fri, 06 Apr 2007 18:35:23 +0000 |
| parents | 48e36bb28baf |
| children | 7596f1771948 4ef881a120fe |
comparison
equal
deleted
inserted
replaced
| 76977:988e52fbb508 | 76978:69597b621497 |
|---|---|
| 780 desktop-header | 780 desktop-header |
| 781 ";; Created " (current-time-string) "\n" | 781 ";; Created " (current-time-string) "\n" |
| 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 " |
| 789 (int-to-string (- (length kill-ring) (length kill-ring-yank-pointer))) | 789 (int-to-string (- (length kill-ring) (length kill-ring-yank-pointer))) |
| 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)) |
| 797 (unless (zerop eager) | 797 (unless (zerop eager) |
| 798 (setq eager (1- eager)) | 798 (setq eager (1- eager)) |
| 799 t)) | 799 t)) |
| 800 "desktop-create-buffer" | 800 "desktop-create-buffer" |
| 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"))) |
| 808 info) | 808 info) |
| 809 (setq default-directory dirname) | 809 (setq default-directory dirname) |
| 1043 (cond ((equal '(t) desktop-buffer-minor-modes) ; backwards compatible | 1043 (cond ((equal '(t) desktop-buffer-minor-modes) ; backwards compatible |
| 1044 (auto-fill-mode 1)) | 1044 (auto-fill-mode 1)) |
| 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)))) |
| 1052 (if handler | 1052 (if handler |
| 1053 (funcall handler desktop-buffer-locals) | 1053 (funcall handler desktop-buffer-locals) |