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

[Juanma Barranquero]

Index: emacs/lisp/desktop.el
diff -c emacs/lisp/desktop.el:1.56 emacs/lisp/desktop.el:1.57
*** emacs/lisp/desktop.el:1.56  Sun Jun  1 13:17:10 2003
--- emacs/lisp/desktop.el       Tue Jun  3 19:30:43 2003
***************
*** 394,400 ****
    (when
      (and
        desktop-enable
!       (let ((exists (file-exists-p (concat desktop-dirname 
desktop-base-file-name))))
          (or
            (eq desktop-save 't)
            (and exists (memq desktop-save '(ask-if-new if-exists)))
--- 394,400 ----
    (when
      (and
        desktop-enable
!       (let ((exists (file-exists-p (expand-file-name desktop-base-file-name 
desktop-dirname))))
          (or
            (eq desktop-save 't)
            (and exists (memq desktop-save '(ask-if-new if-exists)))
***************
*** 405,413 ****
              (y-or-n-p "Save desktop? ")))))
      (unless desktop-dirname
        (setq desktop-dirname
!         (expand-file-name
!           (call-interactively
!             (lambda (dir) (interactive "DDirectory for desktop file: ") 
dir)))))
      (condition-case err
        (desktop-save desktop-dirname)
        (file-error
--- 405,414 ----
              (y-or-n-p "Save desktop? ")))))
      (unless desktop-dirname
        (setq desktop-dirname
!         (file-name-as-directory
!           (expand-file-name
!             (call-interactively
!               (lambda (dir) (interactive "DDirectory for desktop file: ") 
dir))))))
      (condition-case err
        (desktop-save desktop-dirname)
        (file-error
***************
*** 583,589 ****
    (run-hooks 'desktop-save-hook)
    (setq dirname (file-name-as-directory (expand-file-name dirname)))
    (save-excursion
!     (let ((filename (concat dirname desktop-base-file-name))
            (info
              (mapcar
                (function
--- 584,590 ----
    (run-hooks 'desktop-save-hook)
    (setq dirname (file-name-as-directory (expand-file-name dirname)))
    (save-excursion
!     (let ((filename (expand-file-name desktop-base-file-name dirname))
            (info
              (mapcar
                (function
***************
*** 666,676 ****
    "Delete the Desktop file and inactivate the desktop system."
    (interactive)
    (if desktop-dirname
!       (let ((filename (concat desktop-dirname desktop-base-file-name)))
!       (setq desktop-dirname nil)
!       (if (file-exists-p filename)
!           (delete-file filename)))))
! 
  ;; 
----------------------------------------------------------------------------
  ;;;###autoload
  (defun desktop-read ()
--- 667,676 ----
    "Delete the Desktop file and inactivate the desktop system."
    (interactive)
    (if desktop-dirname
!       (let ((filename (expand-file-name desktop-base-file-name 
desktop-dirname)))
!     (setq desktop-dirname nil)
!     (if (file-exists-p filename)
!         (delete-file filename)))))
  ;; 
----------------------------------------------------------------------------
  ;;;###autoload
  (defun desktop-read ()
***************
*** 688,694 ****
            (not
              (file-exists-p (expand-file-name desktop-base-file-name (car 
dirs)))))
          (setq dirs (cdr dirs)))
!       (setq desktop-dirname (and dirs (expand-file-name (car dirs))))
        (if desktop-dirname
          (let ((desktop-first-buffer nil))
            ;; Evaluate desktop buffer.
--- 688,694 ----
            (not
              (file-exists-p (expand-file-name desktop-base-file-name (car 
dirs)))))
          (setq dirs (cdr dirs)))
!       (setq desktop-dirname (and dirs (file-name-as-directory 
(expand-file-name (car dirs)))))
        (if desktop-dirname
          (let ((desktop-first-buffer nil))
            ;; Evaluate desktop buffer.
***************
*** 727,742 ****
  However, if `desktop-enable' was nil at call, don't save the old desktop.
  This function always sets `desktop-enable' to t."
    (interactive "DNew directory: ")
    (desktop-kill)
    (desktop-clear)
-   (cd dir)
    (setq desktop-enable t)
!   (let ((desktop-path '(".")))
!     (desktop-read)
!     ;; Set `desktop-dirname' even in no desktop file was found
!     (setq desktop-dirname (expand-file-name dir))))
! 
! ;; 
----------------------------------------------------------------------------
  ;;;###autoload
  (defun desktop-save-in-load-dir ()
    "Save desktop in directory from which it was loaded."
--- 727,742 ----
  However, if `desktop-enable' was nil at call, don't save the old desktop.
  This function always sets `desktop-enable' to t."
    (interactive "DNew directory: ")
+   (setq dir (file-name-as-directory (expand-file-name dir desktop-dirname)))
    (desktop-kill)
    (desktop-clear)
    (setq desktop-enable t)
!   (let ((desktop-path (list dir))
!         (default-directory dir))
!     (desktop-read))
!   ;; Set `desktop-dirname' even in no desktop file was found
!   (setq desktop-dirname dir))
!   ;; 
----------------------------------------------------------------------------
  ;;;###autoload
  (defun desktop-save-in-load-dir ()
    "Save desktop in directory from which it was loaded."
***************
*** 875,881 ****
      (let (
        (buffer-list (buffer-list))
        (hlist desktop-buffer-handlers)
-       (desktop-first-buffer)
        (result)
        (handler)
      )
--- 875,880 ----
***************
*** 909,915 ****
                (when (functionp minor-mode) (funcall minor-mode 1)))
              desktop-buffer-minor-modes)))
          ;; Even though point and mark are non-nil when written by 
`desktop-save'
!         ;; they may be modified by mandlers wanting to set point or mark 
themselves.
          (when desktop-buffer-point (goto-char desktop-buffer-point))
          (when desktop-buffer-mark
            (if (consp desktop-buffer-mark)
--- 908,914 ----
                (when (functionp minor-mode) (funcall minor-mode 1)))
              desktop-buffer-minor-modes)))
          ;; Even though point and mark are non-nil when written by 
`desktop-save'
!         ;; they may be modified by handlers wanting to set point or mark 
themselves.
          (when desktop-buffer-point (goto-char desktop-buffer-point))
          (when desktop-buffer-mark
            (if (consp desktop-buffer-mark)