Mercurial > emacs

comparison lisp/desktop.el @ 90979:988f1edc9674

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge from emacs--devo--0 Patches applied: * emacs--devo--0 (patch 803-805) - Update from CVS Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-227
author Miles Bader <miles@gnu.org>
date Mon, 09 Jul 2007 08:00:55 +0000
parents 3619e7770f2e a53017ab8b85
children a66921565bcb
comparison
equal deleted inserted replaced
90978:f866074aedc4 90979:988f1edc9674
624 (y-or-n-p "Save desktop? "))))) 624 (y-or-n-p "Save desktop? ")))))
625 (unless desktop-dirname 625 (unless desktop-dirname
626 (setq desktop-dirname 626 (setq desktop-dirname
627 (file-name-as-directory 627 (file-name-as-directory
628 (expand-file-name 628 (expand-file-name
629 (call-interactively 629 (read-directory-name "Directory for desktop file: " nil nil t)))))
630 (lambda (dir)
631 (interactive "DDirectory for desktop file: ") dir))))))
632 (condition-case err 630 (condition-case err
633 (desktop-save desktop-dirname t) 631 (desktop-save desktop-dirname t)
634 (file-error 632 (file-error
635 (unless (yes-or-no-p "Error while saving the desktop. Ignore? ") 633 (unless (yes-or-no-p "Error while saving the desktop. Ignore? ")
636 (signal (car err) (cdr err)))))) 634 (signal (car err) (cdr err))))))
963 (memq desktop-load-locked-desktop '(nil ask)) 961 (memq desktop-load-locked-desktop '(nil ask))
964 (or (null desktop-load-locked-desktop) 962 (or (null desktop-load-locked-desktop)
965 (not (y-or-n-p (format "Warning: desktop file appears to be in use by PID %s.\n\ 963 (not (y-or-n-p (format "Warning: desktop file appears to be in use by PID %s.\n\
966 Using it may cause conflicts. Use it anyway? " owner))))) 964 Using it may cause conflicts. Use it anyway? " owner)))))
967 (progn 965 (progn
968 (setq desktop-dirname nil)
969 (let ((default-directory desktop-dirname)) 966 (let ((default-directory desktop-dirname))
970 (run-hooks 'desktop-not-loaded-hook)) 967 (run-hooks 'desktop-not-loaded-hook))
968 (setq desktop-dirname nil)
971 (message "Desktop file in use; not loaded.")) 969 (message "Desktop file in use; not loaded."))
972 (desktop-lazy-abort) 970 (desktop-lazy-abort)
973 ;; Evaluate desktop buffer and remember when it was modified. 971 ;; Evaluate desktop buffer and remember when it was modified.
974 (load (desktop-full-file-name) t t t) 972 (load (desktop-full-file-name) t t t)
975 (setq desktop-file-modtime (nth 5 (file-attributes (desktop-full-file-name)))) 973 (setq desktop-file-modtime (nth 5 (file-attributes (desktop-full-file-name))))