*** empty log message ***

4 files changed, 21 insertions, 10 deletions

diff --git a/lisp/files.el b/lisp/files.el
index aa597d642eb..c86008bb93b 100644
--- a/lisp/files.el
+++ b/lisp/files.el
@@ -839,7 +839,14 @@ Value is a list whose car is the name for the backup file
            (possibilities (file-name-all-completions
                            base-versions
                            (file-name-directory fn)))
-           (versions (sort (mapcar 'backup-extract-version possibilities)
+           (versions (sort (mapcar
+                            (function
+                             (lambda (fn)
+                               (if (and (string-match "[0-9]+~$" fn bv-length)
+                                        (= (match-beginning 0) bv-length))
+                                   (string-to-int (substring fn bv-length -1))
+                                 0)))
+                            possibilities)
                            '<))
            (high-water-mark (apply 'max 0 versions))
            (deserve-versions-p
@@ -857,12 +864,6 @@ Value is a list whose car is the name for the backup file
                             (rplacd (nthcdr (1- number-to-delete) v) ())
                             v))))))))
 
-(defun backup-extract-version (fn)
-  (if (and (string-match "[0-9]+~$" fn bv-length)
-           (= (match-beginning 0) bv-length))
-      (string-to-int (substring fn bv-length -1))
-      0))
-
 (defun file-nlinks (filename)
   "Return number of names file FILENAME has."
   (car (cdr (file-attributes filename))))
diff --git a/lisp/help.el b/lisp/help.el
index 91a947c99e7..270934d989b 100644
--- a/lisp/help.el
+++ b/lisp/help.el
@@ -69,7 +69,7 @@
       (switch-to-buffer (create-file-buffer file))
       (setq buffer-file-name file)
       (setq default-directory (expand-file-name "~/"))
-      (setq auto-save-file-name nil)
+      (setq buffer-auto-save-file-name nil)
       (insert-file-contents (expand-file-name "TUTORIAL" data-directory))
       (goto-char (point-min))
       (search-forward "\n<<")
diff --git a/lisp/loadup.el b/lisp/loadup.el
index 7f3370493c6..c7bab94f27c 100644
--- a/lisp/loadup.el
+++ b/lisp/loadup.el
@@ -23,6 +23,7 @@
 (buffer-disable-undo "*scratch*")
 
 (load "subr")
+(garbage-collect)
 (load "map-ynp")
 (garbage-collect)
 (load "loaddefs.el")  ;Don't get confused if someone compiled loaddefs by mistake.
@@ -34,22 +35,28 @@
 (load "files")
 (garbage-collect)
 (load "indent")
+(garbage-collect)
 (load "window")
 (garbage-collect)
 (if (fboundp 'delete-screen)
     (load "screen"))
+(garbage-collect)
 (load "paths.el")  ;Don't get confused if someone compiled paths by mistake.
 (garbage-collect)
 (load "startup")
+(garbage-collect)
 (load "lisp")
 (garbage-collect)
 (load "page")
+(garbage-collect)
 (load "register")
 (garbage-collect)
 (load "paragraphs")
+(garbage-collect)
 (load "lisp-mode")
 (garbage-collect)
 (load "text-mode")
+(garbage-collect)
 (load "fill")
 (garbage-collect)
 (load "c-mode")
diff --git a/lisp/startup.el b/lisp/startup.el
index 0bfcf5ecf18..8437a98e683 100644
--- a/lisp/startup.el
+++ b/lisp/startup.el
@@ -155,8 +155,11 @@ directory name of the directory where the `.emacs' file was looked for.")
                (string= vc "simple"))
            (setq version-control 'never))))
 
-  ;; Choose a good default value for split-window-keep-point.
-  (setq split-window-keep-point (> baud-rate 2400))
+  ;;! This has been commented out; I currently find the behavior when
+  ;;! split-window-keep-point is nil disturbing, but if I can get used
+  ;;! to it, then it would be better to eliminate the option.
+  ;;! ;; Choose a good default value for split-window-keep-point.
+  ;;! (setq split-window-keep-point (> baud-rate 2400))
 
   ;; Read window system's init file if using a window system.
   (if (and window-system (not noninteractive))