# HG changeset patch
# User Richard M. Stallman <rms@gnu.org>
# Date 1015838127 0
# Node ID 7837693f5bace4aed5e9723e4e66eb9ad6333962
# Parent  78c2427665f00077eff894b82d26dfd90e317ce5
(desktop-buffer-handlers): Doc fix.
(desktop-buffer-file): Explicitly return BUF.

diff -r 78c2427665f0 -r 7837693f5bac lisp/desktop.el
--- 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