comparison lisp/desktop.el @ 51441:b9a57b098ab3

(desktop-create-buffer): Undo last change. (desktop-kill, desktop-save, desktop-remove): Use expand-directory rather than concat to construct desktop filename. (desktop-kill, desktop-read, desktop-change-dir): Ensure desktop-dirname is a directory name. (desktop-change-dir): Fix bug when DIR was relative.

51440:5c94c67cf9c1

If the desktop should be saved and `desktop-dirname'
is nil, ask the user where to save the desktop."
  (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)))
          (and
            (or
              (memq desktop-save '(ask ask-if-new))
              (and exists (eq desktop-save 'ask-if-exists)))
            (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
        (unless (yes-or-no-p "Error while saving the desktop. Ignore? ")
          (signal (car err) (cdr err)))))))

  "Save the Desktop file. Parameter DIRNAME specifies where to save desktop."
  (interactive "DDirectory to save desktop file in: ")
  (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
                (lambda (b)
                  (set-buffer b)

;; ----------------------------------------------------------------------------
(defun desktop-remove ()
  "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 ()
  "Read the Desktop file and the files it specifies.
This is a no-op when Emacs is running in batch mode.

        (and
          dirs
          (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.
          (load (expand-file-name desktop-base-file-name desktop-dirname) t t t)
          ;; `desktop-create-buffer' puts buffers at end of the buffer list.

(defun desktop-change-dir (dir)
  "Save and clear the desktop, then load the desktop from directory DIR.
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."
  (interactive)
  (if desktop-dirname

  ;; allow `default-directory' to change. Therefore we save current buffer.
  (save-current-buffer
    (let (
      (buffer-list (buffer-list))
      (hlist desktop-buffer-handlers)
      (desktop-first-buffer)
      (result)
      (handler)
    )
      ;; Call desktop-buffer-handlers to create buffer.
      (while (and (not result) hlist)

          (mapcar
            #'(lambda (minor-mode)
              (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)
            (progn
              (set-mark (car desktop-buffer-mark))

51441:b9a57b098ab3

If the desktop should be saved and `desktop-dirname'
is nil, ask the user where to save the desktop."
  (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)))
          (and
            (or
              (memq desktop-save '(ask ask-if-new))
              (and exists (eq desktop-save 'ask-if-exists)))
            (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
        (unless (yes-or-no-p "Error while saving the desktop. Ignore? ")
          (signal (car err) (cdr err)))))))

  "Save the Desktop file. Parameter DIRNAME specifies where to save desktop."
  (interactive "DDirectory to save desktop file in: ")
  (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
                (lambda (b)
                  (set-buffer b)

;; ----------------------------------------------------------------------------
(defun desktop-remove ()
  "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 ()
  "Read the Desktop file and the files it specifies.
This is a no-op when Emacs is running in batch mode.

        (and
          dirs
          (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.
          (load (expand-file-name desktop-base-file-name desktop-dirname) t t t)
          ;; `desktop-create-buffer' puts buffers at end of the buffer list.

(defun desktop-change-dir (dir)
  "Save and clear the desktop, then load the desktop from directory DIR.
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."
  (interactive)
  (if desktop-dirname

  ;; allow `default-directory' to change. Therefore we save current buffer.
  (save-current-buffer
    (let (
      (buffer-list (buffer-list))
      (hlist desktop-buffer-handlers)
      (result)
      (handler)
    )
      ;; Call desktop-buffer-handlers to create buffer.
      (while (and (not result) hlist)

          (mapcar
            #'(lambda (minor-mode)
              (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)
            (progn
              (set-mark (car desktop-buffer-mark))