Enhance `c-file-style' in file/directory local variables.

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

diff --git a/lisp/loadup.el b/lisp/loadup.el
index 36bf8de..d4af1d4 100644 (file)
--- a/lisp/loadup.el
+++ b/lisp/loadup.el
@@ -54,7 +54,7 @@
        (equal (nth 3 command-line-args) "unidata-gen.el")
        (equal (nth 4 command-line-args) "unidata-gen-files")
        ;; In case CANNOT_DUMP.
-       (equal (nth 0 command-line-args) "../src/bootstrap-emacs"))
+       (string-match "src/bootstrap-emacs" (nth 0 command-line-args)))
     (let ((dir (car load-path)))
       ;; We'll probably overflow the pure space.
       (setq purify-flag nil)
@@ -243,8 +243,8 @@
     (progn             ; floating pt. functions if we have float support.
       (load "emacs-lisp/float-sup")))
 
-(load "vc-hooks")
-(load "ediff-hook")
+(load "vc/vc-hooks")
+(load "vc/ediff-hook")
 (if (fboundp 'x-show-tip) (load "tooltip"))
 
 ;If you want additional libraries to be preloaded and their