[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/lisp/desktop.el,v
From: |
Juanma Barranquero |
Subject: |
[Emacs-diffs] Changes to emacs/lisp/desktop.el,v |
Date: |
Thu, 14 Feb 2008 14:34:59 +0000 |
CVSROOT: /sources/emacs
Module name: emacs
Changes by: Juanma Barranquero <lektu> 08/02/14 14:34:59
Index: desktop.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/desktop.el,v
retrieving revision 1.122
retrieving revision 1.123
diff -u -b -r1.122 -r1.123
--- desktop.el 12 Feb 2008 23:41:19 -0000 1.122
+++ desktop.el 14 Feb 2008 14:34:59 -0000 1.123
@@ -135,8 +135,6 @@
;;; Code:
-(defvar uniquify-managed)
-
(defvar desktop-file-version "206"
"Version number of desktop file format.
Written into the desktop file and used at desktop read to provide
@@ -651,16 +649,14 @@
value)))
;; ----------------------------------------------------------------------------
-(declare-function uniquify-item-base "uniquify" (cl-x) t) ; defstruct
-
(defun desktop-buffer-info (buffer)
(set-buffer buffer)
(list
+ ;; base name of the buffer; replaces the buffer name if managed by uniquify
+ (and (fboundp 'uniquify-buffer-base-name) (uniquify-buffer-base-name))
;; basic information
(desktop-file-name (buffer-file-name) desktop-dirname)
- (if (bound-and-true-p uniquify-managed)
- (uniquify-item-base (car uniquify-managed))
- (buffer-name))
+ (buffer-name)
major-mode
;; minor modes
(let (ret)
@@ -890,6 +886,7 @@
(insert "\n;; Buffer section -- buffers listed in same order as in
buffer list:\n")
(dolist (l (mapcar 'desktop-buffer-info (buffer-list)))
+ (let ((base (pop l)))
(when (apply 'desktop-save-buffer-p l)
(insert "("
(if (or (not (integerp eager))
@@ -900,9 +897,11 @@
"desktop-append-buffer-args")
" "
desktop-file-version)
+ ;; If the base name is non-nil, we save it instead of the
buffer name
+ (when base (setcar (nthcdr 1 l) base))
(dolist (e l)
(insert "\n " (desktop-value-to-string e)))
- (insert ")\n\n")))
+ (insert ")\n\n"))))
(setq default-directory desktop-dirname)
(let ((coding-system-for-write 'emacs-mule))