From 0a8c82250e3c9674cc574393c1727b9b8fd58461 Mon Sep 17 00:00:00 2001 From: "Richard M. Stallman" Date: Mon, 11 Mar 2002 09:15:27 +0000 Subject: [PATCH] (desktop-buffer-handlers): Doc fix. (desktop-buffer-file): Explicitly return BUF. --- lisp/desktop.el | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/lisp/desktop.el b/lisp/desktop.el index e9791cc0f90..f0749ef66a1 100644 --- a/lisp/desktop.el +++ b/lisp/desktop.el @@ -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 -- 2.39.2