Commit 93c5a976 authored by Juanma Barranquero's avatar Juanma Barranquero
Browse files

(uniquify-managed): Pacify byte compiler.

(desktop-buffer-info): If the buffer name is managed by uniquify,
save the base name, not the uniquified one.
(desktop-create-buffer): Allow `rename-buffer' to generate a new
name in case of conflict.
parent e4a0f843
2007-10-27 Juanma Barranquero <lekktu@gmail.com>
* desktop.el (uniquify-managed): Pacify byte compiler.
(desktop-buffer-info): If the buffer name is managed by uniquify,
save the base name, not the uniquified one.
(desktop-create-buffer): Allow `rename-buffer' to generate a new
name in case of conflict.
2007-10-26 Glenn Morris <rgm@gnu.org>
 
* emacs-lisp/bytecomp.el (byte-compile-warnings): Autoload the
......@@ -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 @@ is nil, ask the user where to save the desktop."
(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 @@ directory DIRNAME."
(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))
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment