# HG changeset patch
# User Juanma Barranquero <lekktu@gmail.com>
# Date 1122632539 0
# Node ID b110ecf69f544b7dbc86c8885362b0960a357bef
# Parent  9a6cb62f51843d36b0faf4489f65e81e156b8a6d
(desktop-save-buffer): Fix typos in docstring.
(desktop-load-default): Simplify.

diff -r 9a6cb62f5184 -r b110ecf69f54 lisp/desktop.el
--- a/lisp/desktop.el	Fri Jul 29 02:04:06 2005 +0000
+++ b/lisp/desktop.el	Fri Jul 29 10:22:19 2005 +0000
@@ -106,7 +106,8 @@
   :group 'desktop)
 
 ;; Maintained for backward compatibility
-(define-obsolete-variable-alias 'desktop-enable 'desktop-save-mode "22.1")
+(define-obsolete-variable-alias 'desktop-enable
+                                'desktop-save-mode "22.1")
 
 (defcustom desktop-save 'ask-if-new
   "*Specifies whether the desktop should be saved when it is killed.
@@ -136,7 +137,8 @@
   "Name of file for Emacs desktop, excluding the directory part."
   :type 'file
   :group 'desktop)
-(define-obsolete-variable-alias 'desktop-basefilename 'desktop-base-file-name "22.1")
+(define-obsolete-variable-alias 'desktop-basefilename
+                                'desktop-base-file-name "22.1")
 
 (defcustom desktop-path '("." "~")
   "List of directories to search for the desktop file.
@@ -292,8 +294,8 @@
   "When non-nil, save buffer status in desktop file.
 This variable becomes buffer local when set.
 
-If the value is a function, it called by `desktop-save' with argument
-DESKTOP-DIRNAME to obtain auxiliary information to saved in the desktop
+If the value is a function, it is called by `desktop-save' with argument
+DESKTOP-DIRNAME to obtain auxiliary information to save in the desktop
 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
@@ -776,11 +778,11 @@
 (defun desktop-load-default ()
   "Load the `default' start-up library manually.
 Also inhibit further loading of it."
-  (if (not inhibit-default-init)	; safety check
-      (progn
-	(load "default" t t)
-	(setq inhibit-default-init t))))
-(make-obsolete 'desktop-load-default 'desktop-save-mode "22.1")
+  (unless inhibit-default-init	        ; safety check
+    (load "default" t t)
+    (setq inhibit-default-init t)))
+(make-obsolete 'desktop-load-default
+               'desktop-save-mode "22.1")
 
 ;; ----------------------------------------------------------------------------
 ;;;###autoload
@@ -801,7 +803,7 @@
   "Save the desktop in directory `desktop-dirname'."
   (interactive)
   (if desktop-dirname
-    (desktop-save desktop-dirname)
+      (desktop-save desktop-dirname)
     (call-interactively 'desktop-save))
   (message "Desktop saved in %s" desktop-dirname))