[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/lisp/desktop.el,v [EMACS_22_BASE]
From: |
Juanma Barranquero |
Subject: |
[Emacs-diffs] Changes to emacs/lisp/desktop.el,v [EMACS_22_BASE] |
Date: |
Sat, 27 Oct 2007 17:10:50 +0000 |
CVSROOT: /cvsroot/emacs
Module name: emacs
Branch: EMACS_22_BASE
Changes by: Juanma Barranquero <lektu> 07/10/27 17:10:50
Index: desktop.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/desktop.el,v
retrieving revision 1.108.2.4
retrieving revision 1.108.2.5
diff -u -b -r1.108.2.4 -r1.108.2.5
--- desktop.el 25 Jul 2007 04:47:31 -0000 1.108.2.4
+++ desktop.el 27 Oct 2007 17:10:50 -0000 1.108.2.5
@@ -135,6 +135,8 @@
;;; 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
@@ -653,7 +655,9 @@
(list
;; basic information
(desktop-file-name (buffer-file-name) desktop-dirname)
- (buffer-name)
+ (if (bound-and-true-p uniquify-managed)
+ (uniquify-item-base (car uniquify-managed))
+ (buffer-name))
major-mode
;; minor modes
(let (ret)
@@ -1149,7 +1153,7 @@
(setq desktop-first-buffer result))
(set-buffer result)
(unless (equal (buffer-name) desktop-buffer-name)
- (rename-buffer desktop-buffer-name))
+ (rename-buffer desktop-buffer-name t))
;; minor modes
(cond ((equal '(t) desktop-buffer-minor-modes) ; backwards compatible
(auto-fill-mode 1))
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] Changes to emacs/lisp/desktop.el,v [EMACS_22_BASE],
Juanma Barranquero <=