Mercurial > emacs
changeset 43831:7837693f5bac
(desktop-buffer-handlers): Doc fix.
(desktop-buffer-file): Explicitly return BUF.
| author | Richard M. Stallman <rms@gnu.org> |
|---|---|
| date | Mon, 11 Mar 2002 09:15:27 +0000 |
| parents | 78c2427665f0 |
| children | 5d834c3f5d18 |
| files | lisp/desktop.el |
| diffstat | 1 files changed, 4 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/desktop.el Mon Mar 11 09:14:28 2002 +0000 +++ b/lisp/desktop.el Mon Mar 11 09:15:27 2002 +0000 @@ -241,7 +241,8 @@ 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 @@ (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