emacs: lisp/desktop.el comparison

comparison lisp/desktop.el @ 89943:4c90ffeb71c5

Revision: miles@gnu.org--gnu-2004/emacs--unicode--0--patch-15 Merge from emacs--cvs-trunk--0 Patches applied: * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-218 - miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-220 Update from CVS * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-221 Restore deleted tagline in etc/TUTORIAL.ru * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-222 - miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-228 Update from CVS * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-229 Remove TeX output files from the archive * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-230 - miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-247 Update from CVS * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-248 src/lisp.h (CYCLE_CHECK): Macro moved from xfaces.c * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-249 - miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-256 Update from CVS * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-258 - miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-263 Update from CVS * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-264 Update from CVS: lispref/display.texi: emacs -> Emacs. * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-265 - miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-274 Update from CVS * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-275 Update from CVS: man/makefile.w32-in: Revert last change * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-276 - miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-295 Update from CVS * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-296 Allow restarting an existing debugger session that's exited * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-297 - miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-299 Update from CVS * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-300 - miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-327 Update from CVS * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-328 Update from CVS: src/.gdbinit (xsymbol): Fix last change. * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-329 - miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-344 Update from CVS * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-345 Tweak source regexps so that building in place won't cause problems * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-346 - miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-351 Update from CVS * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-352 Update from CVS: lisp/flymake.el: New file. * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-353 - miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-361 Update from CVS * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-362 Support " [...]" style defaults in minibuffer-electric-default-mode * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-363 (read-number): Use canonical format for default in prompt. * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-364 - miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-367 Update from CVS * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-368 Improve display-supports-face-attributes-p on non-ttys * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-369 Rewrite face-differs-from-default-p * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370 Move `display-supports-face-attributes-p' entirely into C code * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-371 Update from CVS * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-372 Simplify face-differs-from-default-p; don't consider :stipple. * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-373 Update from CVS * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-374 (tty_supports_face_attributes_p): Ensure attributes differ from default * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-375 - miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-376 Update from CVS * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-377 (Fdisplay_supports_face_attributes_p): Work around bootstrapping problem * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-378 - miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-380 Update from CVS * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381 Face merging cleanups * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-382 - miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-384 Update from CVS * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-385 src/xfaces.c (push_named_merge_point): Return 0 if a cycle is detected * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-386 - miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-395 Update from CVS * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-396 Tweak arch tagging to make build/install-in-place less annoying * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-397 Work around vc-arch problems when building eshell * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-398 Tweak permissions * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-399 Tweak directory permissions * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-400 Update from CVS * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-401 More build-in-place tweaking of arch tagging * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-402 Update from CVS * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-403 Yet more build-in-place tweaking of arch tagging * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-404 - miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-409 Update from CVS * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-410 Make sure image types are initialized for lookup too * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-411 - miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-416 Update from CVS

author	Miles Bader <miles@gnu.org>
date	Mon, 28 Jun 2004 07:56:49 +0000
parents	68c22ea6027c 27173676bedf
children	566253900690

comparison

equal deleted inserted replaced

-:9cb747ae49af
+:4c90ffeb71c5
 ;; Save window configuration.
 ;; Recognize more minor modes.
 ;; Save mark rings.
 ;;; Code:
-;; Make the compilation more silent
-(eval-when-compile
-;; We use functions from these modules
-;; We can't (require 'mh-e) since that wants to load something.
-(mapcar 'require '(info dired reporter)))
 (defvar desktop-file-version "206"
 "Version number of desktop file format.
 Written into the desktop file and used at desktop read to provide
 backward compatibility.")
 The base name of the file is specified in `desktop-base-file-name'."
 :type '(repeat directory)
 :group 'desktop)
 (defcustom desktop-missing-file-warning nil
-"*If non-nil then `desktop-read' warns when a file no longer exists.
+"*If non-nil then `desktop-read' asks if a non-existent file should be recreated.
-Otherwise it simply ignores that file."
+Also pause for a moment to display message about errors signaled in
+`desktop-buffer-mode-handlers'.
+If nil, just print error messages in the message buffer."
 :type 'boolean
 :group 'desktop)
 (defcustom desktop-no-desktop-file-hook nil
 "Normal hook run when `desktop-read' can't find a desktop file.
 "^/[^/:]*:"
 "Regexp identifying files whose buffers are to be excluded from saving."
 :type 'regexp
 :group 'desktop)
-(defcustom desktop-buffer-modes-to-save
-'(Info-mode rmail-mode)
-"If a buffer is of one of these major modes, save the buffer state.
-It is up to the functions in `desktop-buffer-handlers' to decide
-whether the buffer should be recreated or not, and how."
-:type '(repeat symbol)
-:group 'desktop)
 (defcustom desktop-modes-not-to-save nil
 "List of major modes whose buffers should not be saved."
 :type '(repeat symbol)
 :group 'desktop)
 tilde    -- Relative to ~.
 local    -- Relative to directory of desktop file."
 :type '(choice (const absolute) (const tilde) (const local))
 :group 'desktop)
-(defcustom desktop-buffer-misc-functions
+;;;###autoload
-'(desktop-buffer-info-misc-data
+(defvar desktop-save-buffer nil
-desktop-buffer-dired-misc-data)
+"When non-nil, save buffer status in desktop file.
-"*Functions used to determine auxiliary information for a buffer.
+This variable becomes buffer local when set.
-These functions are called by `desktop-save' in order, with no
-arguments.  If a function returns non-nil, its value is saved along
+If the value is a function, it called by `desktop-save' with argument
-with the state of the buffer for which it was called; no further
+DESKTOP-DIRNAME to obtain auxiliary information to saved in the desktop
-functions will be called.
+file along with the state of the buffer for which it was called.
 When file names are returned, they should be formatted using the call
-\"(desktop-file-name FILE-NAME dirname)\".
+\"(desktop-file-name FILE-NAME DESKTOP-DIRNAME)\".
-Later, when `desktop-read' restores buffers, each of the functions in
+Later, when `desktop-read' calls a function in `desktop-buffer-mode-handlers'
-`desktop-buffer-handlers' will have access to a buffer local variable,
+to restore the buffer, the auxiliary information is passed as the argument
-named `desktop-buffer-misc', whose value is what the function in
+DESKTOP-BUFFER-MISC.")
-`desktop-buffer-misc-functions' returned."
+(make-variable-buffer-local 'desktop-save-buffer)
-:type '(repeat function)
+(make-obsolete-variable 'desktop-buffer-modes-to-save
-:group 'desktop)
+'desktop-save-buffer)
+(make-obsolete-variable 'desktop-buffer-misc-functions
-(defcustom desktop-buffer-handlers
+'desktop-save-buffer)
-'(desktop-buffer-dired
-desktop-buffer-rmail
+(defcustom desktop-buffer-mode-handlers '(
-desktop-buffer-mh
+(dired-mode . dired-restore-desktop-buffer)
-desktop-buffer-info
+(rmail-mode . rmail-restore-desktop-buffer)
-desktop-buffer-file)
+(mh-folder-mode . mh-restore-desktop-buffer)
-"*Functions called by `desktop-read' in order to create a buffer.
+(Info-mode . Info-restore-desktop-buffer))
-The functions are called without explicit parameters but can use the
+"Alist of major mode specific functions to restore a desktop buffer.
-following variables:
+Functions are called by `desktop-read'. List elements must have the form
+\(MAJOR-MODE . RESTORE-BUFFER-FUNCTION).
+Buffers with a major mode not specified here, are restored by the default
+handler `desktop-restore-file-buffer'.
+Handlers are called with argument list
+(DESKTOP-BUFFER-FILE-NAME DESKTOP-BUFFER-NAME DESKTOP-BUFFER-MISC)
+Furthermore, they may use the following variables:
 desktop-file-version
-desktop-buffer-file-name
-desktop-buffer-name
 desktop-buffer-major-mode
 desktop-buffer-minor-modes
 desktop-buffer-point
 desktop-buffer-mark
 desktop-buffer-read-only
-desktop-buffer-misc
 desktop-buffer-locals
-If one function returns non-nil, no further functions are called.
+If a handler returns a buffer, then the saved mode settings
-If the function returns a buffer, then the saved mode settings
 and variable values for that buffer are copied into it."
-:type '(repeat function)
+:type 'alist
 :group 'desktop)
-(put 'desktop-buffer-handlers 'risky-local-variable t)
+(put 'desktop-buffer-mode-handlers 'risky-local-variable t)
+(make-obsolete-variable 'desktop-buffer-handlers
+'desktop-buffer-mode-handlers)
 (defcustom desktop-minor-mode-table
 '((auto-fill-function auto-fill-mode)
 (vc-mode nil))
 "Table mapping minor mode variables to minor mode functions.
 Each entry has the form (NAME RESTORE-FUNCTION).
 NAME is the name of the buffer-local variable indicating that the minor
 mode is active.  RESTORE-FUNCTION is the function to activate the minor mode.
 called.  RESTORE-FUNCTION nil means don't try to restore the minor mode.
 Only minor modes for which the name of the buffer-local variable
-and the name of the minor mode function are different have to added to
+and the name of the minor mode function are different have to be added to
 this table."
 :type 'sexp
 :group 'desktop)
 ;; ----------------------------------------------------------------------------
 		  (desktop-value-to-string (symbol-value var))
 		  ")\n")))))
 ;; ----------------------------------------------------------------------------
 (defun desktop-save-buffer-p (filename bufname mode &rest dummy)
-"Return t if the desktop should record a particular buffer for next startup.
+"Return t if buffer should have its state saved in the desktop file.
 FILENAME is the visited file name, BUFNAME is the buffer name, and
 MODE is the major mode."
 (let ((case-fold-search nil))
 (and (not (string-match desktop-buffers-not-to-save bufname))
-	 (not (memq mode desktop-modes-not-to-save))
+(not (memq mode desktop-modes-not-to-save))
-	 (or (and filename
+(or (and filename
-		  (not (string-match desktop-files-not-to-save filename)))
+(not (string-match desktop-files-not-to-save filename)))
-	     (and (eq mode 'dired-mode)
+(and (eq mode 'dired-mode)
-		  (save-excursion
+(with-current-buffer bufname
-		    (set-buffer (get-buffer bufname))
+(not (string-match desktop-files-not-to-save
-		    (not (string-match desktop-files-not-to-save
+default-directory))))
-				       default-directory))))
+(and (null filename)
-	     (and (null filename)
+		  (with-current-buffer bufname desktop-save-buffer))))))
-		  (memq mode desktop-buffer-modes-to-save))))))
 ;; ----------------------------------------------------------------------------
 (defun desktop-file-name (filename dirname)
 "Convert FILENAME to format specified in `desktop-file-name-format'.
 DIRNAME must be the directory in which the desktop file will be saved."
 (desktop-file-name (buffer-file-name) dirname)
 (buffer-name)
 major-mode
 ;; minor modes
 (let (ret)
-(mapcar
+(mapc
-#'(lambda (mim)
+#'(lambda (minor-mode)
 (and
-(boundp mim)
+(boundp minor-mode)
-(symbol-value mim)
+(symbol-value minor-mode)
-(setq ret
+(let ((special (assq minor-mode desktop-minor-mode-table)))
-(cons
+(when (or special (functionp minor-mode))
-(let ((special (assq mim desktop-minor-mode-table)))
+(setq ret
-(if special (cadr special) mim))
+(cons
-ret))))
+(if special (cadr special) minor-mode)
+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)
+;; Auxiliary information
+(when (functionp desktop-save-buffer)
+(funcall desktop-save-buffer dirname))
 (let ((locals desktop-locals-to-save)
 (loclist (buffer-local-variables))
 (ll))
 (while locals
 (let ((here (assq (car locals) loclist)))
 (and desktop-path (car desktop-path))
 ;; Default: Home directory.
 "~"))))
 (if (file-exists-p (expand-file-name desktop-base-file-name desktop-dirname))
 ;; Desktop file found, process it.
-(let ((desktop-first-buffer nil))
+(let ((desktop-first-buffer nil)
+(desktop-buffer-ok-count 0)
+(desktop-buffer-fail-count 0))
 ;; 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.
 ;; We want buffers existing prior to evaluating the desktop (and not reused)
 ;; to be placed at the end of the buffer list, so we move them here.
 (nreverse (cdr (memq desktop-first-buffer (nreverse (buffer-list))))))
 (switch-to-buffer (car (buffer-list)))
 (run-hooks 'desktop-delay-hook)
 (setq desktop-delay-hook nil)
 (run-hooks 'desktop-after-read-hook)
-(message "Desktop loaded.")
+(message "Desktop: %d buffer%s restored%s."
+desktop-buffer-ok-count
+(if (= 1 desktop-buffer-ok-count) "" "s")
+(if (< 0 desktop-buffer-fail-count)
+(format ", %d failed to restore" desktop-buffer-fail-count)
+""))
 t)
 ;; No desktop file found.
 (desktop-clear)
 (let ((default-directory desktop-dirname))
 (run-hooks 'desktop-no-desktop-file-hook))
 (error "No desktop file found"))
 (desktop-clear)
 (desktop-read desktop-dirname))
 ;; ----------------------------------------------------------------------------
-;; Note: the following functions use the dynamic variable binding in Lisp.
+(defun desktop-restore-file-buffer (desktop-buffer-file-name
-;;
+desktop-buffer-name
+desktop-buffer-misc)
-(eval-when-compile ; Just to silence the byte compiler
+"Restore a file buffer."
-(defvar desktop-file-version)
+(eval-when-compile ; Just to silence the byte compiler
-(defvar desktop-buffer-file-name)
+(defvar desktop-buffer-major-mode)
-(defvar desktop-buffer-name)
+(defvar desktop-buffer-locals))
-(defvar desktop-buffer-major-mode)
-(defvar desktop-buffer-minor-modes)
-(defvar desktop-buffer-point)
-(defvar desktop-buffer-mark)
-(defvar desktop-buffer-read-only)
-(defvar desktop-buffer-misc)
-(defvar desktop-buffer-locals)
-)
-(defun desktop-buffer-info-misc-data ()
-(if (eq major-mode 'Info-mode)
-(list Info-current-file
-Info-current-node)))
-;; ----------------------------------------------------------------------------
-(defun desktop-buffer-dired-misc-data ()
-(when (eq major-mode 'dired-mode)
-(eval-when-compile (defvar dirname))
-(cons
-;; Value of `dired-directory'.
-(if (consp dired-directory)
-	 ;; Directory name followed by list of files.
-	 (cons (desktop-file-name (car dired-directory) dirname) (cdr dired-directory))
-;; Directory name, optionally with with shell wildcard.
-(desktop-file-name dired-directory dirname))
-;; Subdirectories in `dired-subdir-alist'.
-(cdr
-(nreverse
-(mapcar
-	(function (lambda (f) (desktop-file-name (car f) dirname)))
-	dired-subdir-alist))))))
-;; ----------------------------------------------------------------------------
-(defun desktop-buffer-info () "Load an info file."
-(if (eq 'Info-mode desktop-buffer-major-mode)
-(progn
-	(let ((first (nth 0 desktop-buffer-misc))
-	      (second (nth 1 desktop-buffer-misc)))
-	(when (and first second)
-	  (require 'info)
-	  (with-no-warnings
-	   (Info-find-node first second))
-	  (current-buffer))))))
-;; ----------------------------------------------------------------------------
-(eval-when-compile (defvar rmail-buffer)) ; Just to silence the byte compiler.
-(defun desktop-buffer-rmail () "Load an RMAIL file."
-(if (eq 'rmail-mode desktop-buffer-major-mode)
-(condition-case error
-	  (progn (rmail-input desktop-buffer-file-name)
-(if (eq major-mode 'rmail-mode)
-(current-buffer)
-rmail-buffer))
-	(file-locked
-	 (kill-buffer (current-buffer))
-	 'ignored))))
-;; ----------------------------------------------------------------------------
-(defun desktop-buffer-mh () "Load a folder in the mh system."
-(if (eq 'mh-folder-mode desktop-buffer-major-mode)
-(with-no-warnings
-	(mh-find-path)
-(mh-visit-folder desktop-buffer-name)
-	(current-buffer))))
-;; ----------------------------------------------------------------------------
-(defun desktop-buffer-dired () "Load a directory using dired."
-(if (eq 'dired-mode desktop-buffer-major-mode)
-;; First element of `desktop-buffer-misc' is the value of `dired-directory'.
-;; This value is a directory name, optionally with with shell wildcard or
-;; a directory name followed by list of files.
-(let* ((dired-dir (car desktop-buffer-misc))
-	     (dir (if (consp dired-dir) (car dired-dir) dired-dir)))
-	(if (file-directory-p (file-name-directory dir))
-	    (progn
-	      (dired dired-dir)
-;; The following elements of `desktop-buffer-misc' are the keys
-;; from `dired-subdir-alist'.
-	      (mapcar 'dired-maybe-insert-subdir (cdr desktop-buffer-misc))
-	      (current-buffer))
-	  (message "Directory %s no longer exists." dir)
-	  (sit-for 1)
-	  'ignored))))
-;; ----------------------------------------------------------------------------
-(defun desktop-buffer-file ()
-"Load a file."
 (if desktop-buffer-file-name
 (if (or (file-exists-p desktop-buffer-file-name)
-	      (and desktop-missing-file-warning
+(let ((msg (format "Desktop: File \"%s\" no longer exists."
-		   (y-or-n-p (format
+desktop-buffer-file-name)))
-			      "File \"%s\" no longer exists. Re-create? "
+(if desktop-missing-file-warning
-			      desktop-buffer-file-name))))
+		     (y-or-n-p (concat msg " Re-create? "))
+(message msg)
+nil)))
 	  (let* ((auto-insert nil) ; Disable auto insertion
 		 (coding-system-for-read
 		  (or coding-system-for-read
 		      (cdr (assq 'buffer-file-coding-system
 				 desktop-buffer-locals))))
 	      (error (pop-to-buffer buf)))
 	    (and (not (eq major-mode desktop-buffer-major-mode))
 		 (functionp desktop-buffer-major-mode)
 		 (funcall desktop-buffer-major-mode))
 	    buf)
-	'ignored)))
+	nil)))
 ;; ----------------------------------------------------------------------------
-;; Create a buffer, load its file, set is mode, ...;  called from Desktop file
+;; Create a buffer, load its file, set its mode, ...;
-;; only.
+;; called from Desktop file only.
 (eval-when-compile ; Just to silence the byte compiler
 (defvar desktop-first-buffer) ;; Dynamically bound in `desktop-read'
 )
 desktop-buffer-mark
 desktop-buffer-read-only
 desktop-buffer-misc
 &optional
 desktop-buffer-locals)
+;; Just to silence the byte compiler. Bound locally in `desktop-read'.
+(eval-when-compile
+(defvar desktop-buffer-ok-count)
+(defvar desktop-buffer-fail-count))
 ;; To make desktop files with relative file names possible, we cannot
 ;; allow `default-directory' to change. Therefore we save current buffer.
 (save-current-buffer
 (let (
 (buffer-list (buffer-list))
-(hlist desktop-buffer-handlers)
+(result
-(result)
+(condition-case err
-(handler)
+(funcall (or (cdr (assq desktop-buffer-major-mode desktop-buffer-mode-handlers))
+'desktop-restore-file-buffer)
+desktop-buffer-file-name
+desktop-buffer-name
+desktop-buffer-misc)
+(error
+(message "Desktop: Can't load buffer %s: %s"
+desktop-buffer-name (error-message-string err))
+(when desktop-missing-file-warning (sit-for 1))
+nil)))
 )
-;; Call desktop-buffer-handlers to create buffer.
+(if (bufferp result)
-(while (and (not result) hlist)
+(setq desktop-buffer-ok-count (1+ desktop-buffer-ok-count))
-(setq handler (car hlist))
+(setq desktop-buffer-fail-count (1+ desktop-buffer-fail-count))
-(setq result (funcall handler))
+(setq result nil))
-(setq hlist (cdr hlist)))
 (unless (bufferp result) (setq result nil))
 ;; Restore buffer list order with new buffer at end. Don't change
 ;; the order for old desktop files (old desktop module behaviour).
 (unless (< desktop-file-version 206)
 (mapcar 'bury-buffer buffer-list)
 #'(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-point
+(goto-char
+(condition-case err
+;; Evaluate point. Thus point can be something like '(search-forward ...
+(eval desktop-buffer-point)
+(error (message "%s" (error-message-string err)) 1))))
 (when desktop-buffer-mark
 (if (consp desktop-buffer-mark)
 (progn
 (set-mark (car desktop-buffer-mark))
 (setq mark-active (car (cdr desktop-buffer-mark))))

Mercurial > emacs

comparison lisp/desktop.el @ 89943:4c90ffeb71c5