Commit 0a8c8225 authored by Richard M. Stallman's avatar Richard M. Stallman

(desktop-buffer-handlers): Doc fix.

(desktop-buffer-file): Explicitly return BUF.
parent 6be7b127
......@@ -241,7 +241,8 @@ The functions are called without explicit parameters but can use the
variables `desktop-buffer-major-mode', `desktop-buffer-file-name',
`desktop-buffer-name'.
If one function returns non-nil, no further functions are called.
If the function returns t then the buffer is considered created."
If the function returns a buffer, then the saved mode settings
and variable values for that buffer are copied into it."
:type '(repeat function)
:group 'desktop)
......@@ -669,7 +670,8 @@ to provide correct modes for autoloaded files."
(let ((buf (find-file-noselect desktop-buffer-file-name)))
(condition-case nil
(switch-to-buffer buf)
(error (pop-to-buffer buf))))
(error (pop-to-buffer buf)))
buf)
'ignored)))
;; ----------------------------------------------------------------------------
;; Create a buffer, load its file, set is mode, ...; called from Desktop file
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment