X-Git-Url: http://git.hcoop.net/bpt/emacs.git/blobdiff_plain/a63926dbf3677078f5ed1718a231c7f7a672e81d..d6749f8f3d61ad9362f457d2d4f7c0dce80e0e78:/lisp/loadup.el

diff --git a/lisp/loadup.el b/lisp/loadup.el
index ad2f40b925..f4da8db885 100644
--- a/lisp/loadup.el
+++ b/lisp/loadup.el
@@ -18,8 +18,9 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs; see the file COPYING.  If not, write to
-;; the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+;; along with GNU Emacs; see the file COPYING.  If not, write to the
+;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+;; Boston, MA 02111-1307, USA.
 
 ;;; Commentary:
 
@@ -71,9 +72,9 @@
       (garbage-collect)
       (load "mouse")
       (garbage-collect)
-      (load "menu-bar")
       (load "scroll-bar")
       (load "select")))
+(load "menu-bar")
 (garbage-collect)
 (load "paths.el")  ;Don't get confused if someone compiled paths by mistake.
 (garbage-collect)
@@ -93,8 +94,6 @@
 (garbage-collect)
 (load "fill")
 (garbage-collect)
-(load "c-mode")
-(garbage-collect)
 (load "replace")
 (if (eq system-type 'vax-vms)
     (progn
@@ -113,6 +112,8 @@
       (garbage-collect)
       (load "ls-lisp")
       (garbage-collect)
+      (load "disp-table") ; needed to setup ibm-pc char set, see internal.el
+      (garbage-collect)
       (load "winnt")
       (garbage-collect)))
 (if (eq system-type 'ms-dos)
@@ -137,7 +138,7 @@
 ;you may load them with a "site-load.el" file.
 ;But you must also cause them to be scanned when the DOC file
 ;is generated.  For VMS, you must edit ../vms/makedoc.com.
-;For other systems, you must edit ../src/Makefile.in.in.
+;For other systems, you must edit ../src/Makefile.in.
 (if (load "site-load" t)
     (garbage-collect))
 
@@ -152,10 +153,10 @@
 (if (and (or (equal (nth 3 command-line-args) "dump")
 	     (equal (nth 4 command-line-args) "dump"))
 	 (not (eq system-type 'ms-dos)))
-    (let* ((base (concat "emacs-" emacs-version))
+    (let* ((base (concat "emacs-" emacs-version "."))
 	   (files (file-name-all-completions base default-directory))
 	   (versions (mapcar (function (lambda (name)
-					 (string-to-int (substring name (1+ (length base))))))
+					 (string-to-int (substring name (length base)))))
 			     files)))
       (setq emacs-version (format "%s.%d"
 				  emacs-version
@@ -178,7 +179,7 @@
 			   (substring name (match-end 0)))))
       (if (memq system-type '(ms-dos windows-nt))
 	  (setq name (expand-file-name
-		      (if (fboundp 'make-frame) "DOC-X" "DOC") "../etc"))
+		      (if (fboundp 'x-create-frame) "DOC-X" "DOC") "../etc"))
 	(setq name (concat (expand-file-name "../etc/DOC-") name))
 	(if (file-exists-p name)
 	    (delete-file name))