Mercurial > emacs

comparison lisp/desktop.el @ 85807:d93ce6f797f6

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge from emacs--rel--22 Patches applied: * emacs--rel--22 (patch 138-139) - Update from CVS Revision: emacs@sv.gnu.org/emacs--devo--0--patch-914
author Miles Bader <miles@gnu.org>
date Tue, 30 Oct 2007 23:28:12 +0000
parents a7aa5ee6bc3a 80e25357226e
children 974997c83cee 880960b70474
comparison
equal deleted inserted replaced
85806:2a9d361b3986 85807:d93ce6f797f6
132 ;; Save window configuration. 132 ;; Save window configuration.
133 ;; Recognize more minor modes. 133 ;; Recognize more minor modes.
134 ;; Save mark rings. 134 ;; Save mark rings.
135 135
136 ;;; Code: 136 ;;; Code:
137
138 (defvar uniquify-managed)
137 139
138 (defvar desktop-file-version "206" 140 (defvar desktop-file-version "206"
139 "Version number of desktop file format. 141 "Version number of desktop file format.
140 Written into the desktop file and used at desktop read to provide 142 Written into the desktop file and used at desktop read to provide
141 backward compatibility.") 143 backward compatibility.")
652 (defun desktop-buffer-info (buffer) 654 (defun desktop-buffer-info (buffer)
653 (set-buffer buffer) 655 (set-buffer buffer)
654 (list 656 (list
655 ;; basic information 657 ;; basic information
656 (desktop-file-name (buffer-file-name) desktop-dirname) 658 (desktop-file-name (buffer-file-name) desktop-dirname)
657 (buffer-name) 659 (if (bound-and-true-p uniquify-managed)
660 (uniquify-item-base (car uniquify-managed))
661 (buffer-name))
658 major-mode 662 major-mode
659 ;; minor modes 663 ;; minor modes
660 (let (ret) 664 (let (ret)
661 (mapc 665 (mapc
662 #'(lambda (minor-mode) 666 #'(lambda (minor-mode)
1148 (when result 1152 (when result
1149 (unless (or desktop-first-buffer (< desktop-file-version 206)) 1153 (unless (or desktop-first-buffer (< desktop-file-version 206))
1150 (setq desktop-first-buffer result)) 1154 (setq desktop-first-buffer result))
1151 (set-buffer result) 1155 (set-buffer result)
1152 (unless (equal (buffer-name) desktop-buffer-name) 1156 (unless (equal (buffer-name) desktop-buffer-name)
1153 (rename-buffer desktop-buffer-name)) 1157 (rename-buffer desktop-buffer-name t))
1154 ;; minor modes 1158 ;; minor modes
1155 (cond ((equal '(t) desktop-buffer-minor-modes) ; backwards compatible 1159 (cond ((equal '(t) desktop-buffer-minor-modes) ; backwards compatible
1156 (auto-fill-mode 1)) 1160 (auto-fill-mode 1))
1157 ((equal '(nil) desktop-buffer-minor-modes) ; backwards compatible 1161 ((equal '(nil) desktop-buffer-minor-modes) ; backwards compatible
1158 (auto-fill-mode 0)) 1162 (auto-fill-mode 0))