X-Git-Url: http://git.chise.org/gitweb/?p=chise%2Fxemacs-chise.git.1;a=blobdiff_plain;f=lisp%2Fupdate-elc.el;h=53ca9eeb185ac5309e7ad53317f4a4a455fdcb4e;hp=1fda28da3e76c2cd27fc808a6bc9fb5eb29a638b;hb=79d2db7d65205bc85d471590726d0cf3af5598e0;hpb=de1ec4b272dfa3f9ef2c9ae28a9ba67170d24da5 diff --git a/lisp/update-elc.el b/lisp/update-elc.el index 1fda28d..53ca9ee 100644 --- a/lisp/update-elc.el +++ b/lisp/update-elc.el @@ -106,7 +106,6 @@ (setq preloaded-file-list (append packages-hardcoded-lisp preloaded-file-list - packages-useful-lisp site-load-packages)) (while preloaded-file-list (let ((arg (car preloaded-file-list))) @@ -131,25 +130,25 @@ dumped-exe)))) (setq need-to-dump t))) - (if (null (member (file-name-nondirectory arg) - packages-unbytecompiled-lisp)) +; (if (null (member (file-name-nondirectory arg) +; packages-unbytecompiled-lisp)) +; (progn + (setq arg (locate-library arg)) + (if (null arg) (progn - (setq arg (locate-library arg)) - (if (null arg) - (progn - (print (format "Error: Library file %s not found" - (car preloaded-file-list))) - ;; Uncomment in case of trouble - ;;(print (format "late-packages: %S" late-packages)) - ;;(print (format "guessed-roots: %S" (paths-find-emacs-roots invocation-directory invocation-name))) - (kill-emacs))) - (if (string-match "\\.elc?\\'" arg) - (setq arg (substring arg 0 (match-beginning 0)))) - (if (and (null (member arg processed)) - (file-exists-p (concat arg ".el")) - (file-newer-than-file-p (concat arg ".el") - (concat arg ".elc"))) - (setq processed (cons (concat arg ".el") processed))))) + (print (format "Error: Library file %s not found" + (car preloaded-file-list))) + ;; Uncomment in case of trouble + ;;(print (format "late-packages: %S" late-packages)) + ;;(print (format "guessed-roots: %S" (paths-find-emacs-roots invocation-directory invocation-name))) + (kill-emacs))) + (if (string-match "\\.elc?\\'" arg) + (setq arg (substring arg 0 (match-beginning 0)))) + (if (and (null (member arg processed)) + (file-exists-p (concat arg ".el")) + (file-newer-than-file-p (concat arg ".el") + (concat arg ".elc"))) + (setq processed (cons (concat arg ".el") processed))) (setq preloaded-file-list (cdr preloaded-file-list)))) (if need-to-dump