(makefile-font-lock-keywords): Catch variable

[bpt/emacs.git] / lisp / loadup.el

diff --git a/lisp/loadup.el b/lisp/loadup.el
index e6b7906..f4da8db 100644 (file)
--- 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)
@@ -111,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)
@@ -153,7 +156,7 @@
     (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
@@ -176,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))