(desktop-save-buffer): Fix typos in docstring.

(desktop-load-default): Simplify.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 6b30a3f91528daf7e9afa8aa499c891cf27502f7..caa578b253bd6701061ca96b6c339beff735fbaf 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2005-07-29  Juanma Barranquero  <lekktu@gmail.com>
+
+       * desktop.el (desktop-save-buffer): Fix typos in docstring.
+       (desktop-load-default): Simplify.
+
 2005-07-29  Kenichi Handa  <handa@m17n.org>
 
        * international/mule-cmds.el (select-message-coding-system): Be

diff --git a/lisp/desktop.el b/lisp/desktop.el
index 1debc6d9c627f77c8cbdedc244695912a1f64349..0018780d5d59147fd327628dc6e1aa22bd670a05 100644 (file)
--- a/lisp/desktop.el
+++ b/lisp/desktop.el
@@ -106,7 +106,8 @@ desktop is saved."
   :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 @@ determine where the desktop is saved."
   "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 @@ See `desktop-restore-eager'."
   "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 @@ It returns t if a desktop file was loaded, nil otherwise."
 (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 @@ directory DIRNAME."
   "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))