[Emacs-diffs] Changes to emacs/lisp/desktop.el,v

[Juanma Barranquero]

CVSROOT:        /cvsroot/emacs
Module name:    emacs
Changes by:     Juanma Barranquero <lektu>      07/06/20 10:08:07

Index: desktop.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/desktop.el,v
retrieving revision 1.111
retrieving revision 1.112
diff -u -b -r1.111 -r1.112
--- desktop.el  12 Jun 2007 11:14:28 -0000      1.111
+++ desktop.el  20 Jun 2007 10:08:07 -0000      1.112
@@ -626,9 +626,7 @@
       (setq desktop-dirname
             (file-name-as-directory
              (expand-file-name
-              (call-interactively
-               (lambda (dir)
-                 (interactive "DDirectory for desktop file: ") dir))))))
+             (read-directory-name "Directory for desktop file: " nil nil t)))))
     (condition-case err
        (desktop-save desktop-dirname t)
       (file-error
@@ -964,9 +962,9 @@
                       (not (y-or-n-p (format "Warning: desktop file appears to 
be in use by PID %s.\n\
 Using it may cause conflicts.  Use it anyway? " owner)))))
              (progn
-               (setq desktop-dirname nil)
                (let ((default-directory desktop-dirname))
                  (run-hooks 'desktop-not-loaded-hook))
+               (setq desktop-dirname nil)
                (message "Desktop file in use; not loaded."))
            (desktop-lazy-abort)
            ;; Evaluate desktop buffer and remember when it was modified.