Rename ido-max-prompt-width to ido-max-file-prompt-width for consistency.

[gnu-emacs] / lisp / desktop.el

diff --git a/lisp/desktop.el b/lisp/desktop.el
index e9791cc0f90d3c7e23d4f2aedb71c5ee93d7d3b5..11665272f885a34492767dc58a3d5ca4d338c4d0 100644 (file)
--- a/lisp/desktop.el
+++ b/lisp/desktop.el
@@ -241,7 +241,8 @@ The functions are called without explicit parameters but can use the
 variables `desktop-buffer-major-mode', `desktop-buffer-file-name',
 `desktop-buffer-name'.
 If one function returns non-nil, no further functions are called.
-If the function returns t then the buffer is considered created."
+If the function returns a buffer, then the saved mode settings
+and variable values for that buffer are copied into it."
   :type '(repeat function)
   :group 'desktop)
 
@@ -470,6 +471,11 @@ MODE is the major mode."
             (and (null filename)
                  (memq mode desktop-buffer-modes-to-save))))))
 ;; ----------------------------------------------------------------------------
+(defcustom desktop-relative-file-names nil
+  "*Store relative file names in the desktop file."
+  :type 'boolean
+  :group 'desktop)
+
 (defun desktop-save (dirname)
   "Save the Desktop file.  Parameter DIRNAME specifies where to save desktop."
   (interactive "DDirectory to save desktop file in: ")
@@ -480,42 +486,46 @@ MODE is the major mode."
                 (mapcar
                  (function
                   (lambda (b)
-                             (set-buffer b)
-                             (list
-                              (buffer-file-name)
-                              (buffer-name)
-                              major-mode
-                              ;; minor modes
-                              (let (ret)
-                                (mapcar
-                                 #'(lambda (mim)
-                                     (and (boundp mim)
-                                          (symbol-value mim)
-                                          (setq ret
-                                                (cons (let ((special (assq mim desktop-minor-mode-table)))
-                                                       (if special
-                                                           (cadr special)
-                                                         mim))
-                                                     ret))))
-                                 (mapcar #'car minor-mode-alist))
-                                ret)
-                              (point)
-                              (list (mark t) mark-active)
-                              buffer-read-only
-                               (run-hook-with-args-until-success
-                                'desktop-buffer-misc-functions)
-                              (let ((locals desktop-locals-to-save)
-                                    (loclist (buffer-local-variables))
-                                    (ll))
-                                (while locals
-                                  (let ((here (assq (car locals) loclist)))
-                                    (if here
-                                        (setq ll (cons here ll))
-                                      (if (member (car locals) loclist)
-                                          (setq ll (cons (car locals) ll)))))
-                                  (setq locals (cdr locals)))
-                                ll)
-                              )))
+                    (set-buffer b)
+                    (list
+                     (let ((bn (buffer-file-name)))
+                       (if bn
+                           (if desktop-relative-file-names
+                               (file-relative-name bn dirname)
+                             bn)))
+                     (buffer-name)
+                     major-mode
+                     ;; minor modes
+                     (let (ret)
+                       (mapcar
+                        #'(lambda (mim)
+                            (and (boundp mim)
+                                 (symbol-value mim)
+                                 (setq ret
+                                       (cons (let ((special (assq mim desktop-minor-mode-table)))
+                                               (if special
+                                                   (cadr special)
+                                                 mim))
+                                             ret))))
+                        (mapcar #'car minor-mode-alist))
+                       ret)
+                     (point)
+                     (list (mark t) mark-active)
+                     buffer-read-only
+                     (run-hook-with-args-until-success
+                      'desktop-buffer-misc-functions)
+                     (let ((locals desktop-locals-to-save)
+                           (loclist (buffer-local-variables))
+                           (ll))
+                       (while locals
+                         (let ((here (assq (car locals) loclist)))
+                           (if here
+                               (setq ll (cons here ll))
+                             (if (member (car locals) loclist)
+                                 (setq ll (cons (car locals) ll)))))
+                         (setq locals (cdr locals)))
+                       ll)
+                     )))
                  (buffer-list))))
          (buf (get-buffer-create "*desktop*")))
       (set-buffer buf)
@@ -536,15 +546,15 @@ MODE is the major mode."
       (insert "\n;; Buffer section:\n")
       (mapcar
        (function (lambda (l)
-                  (if (apply 'desktop-save-buffer-p l)
-                      (progn
-                        (insert desktop-create-buffer-form)
-                        (mapcar
-                         (function (lambda (e)
-                                     (insert "\n  "
-                                             (desktop-value-to-string e))))
-                         l)
-                        (insert ")\n\n")))))
+         (if (apply 'desktop-save-buffer-p l)
+             (progn
+               (insert desktop-create-buffer-form)
+               (mapcar
+                (function (lambda (e)
+                  (insert "\n  "
+                          (desktop-value-to-string e))))
+                l)
+               (insert ")\n\n")))))
        info)
       (setq default-directory dirname)
       (if (file-exists-p filename) (delete-file filename))
@@ -669,7 +679,8 @@ to provide correct modes for autoloaded files."
          (let ((buf (find-file-noselect desktop-buffer-file-name)))
            (condition-case nil
                (switch-to-buffer buf)
-             (error (pop-to-buffer buf))))
+             (error (pop-to-buffer buf)))
+           buf)
        'ignored)))
 ;; ----------------------------------------------------------------------------
 ;; Create a buffer, load its file, set is mode, ...;  called from Desktop file