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

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

diff --git a/lisp/loadup.el b/lisp/loadup.el
index b6d9706..f4da8db 100644 (file)
--- a/lisp/loadup.el
+++ b/lisp/loadup.el
@@ -112,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)
@@ -177,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))