X-Git-Url: http://git.chise.org/gitweb/?p=chise%2Fxemacs-chise.git.1;a=blobdiff_plain;f=lisp%2Fupdate-elc.el;h=13524f6e084ca334f3fa9f7f0ff9f1fdd8303703;hp=777017a3c40067b86b84d8cb690ba2a9c806bc93;hb=566b3d194e2d5c783808ac39437bd7e1a28b1c5c;hpb=59eec5f21669e81977b5b1fe9bf717cab49cf7fb

diff --git a/lisp/update-elc.el b/lisp/update-elc.el
index 777017a..13524f6 100644
--- a/lisp/update-elc.el
+++ b/lisp/update-elc.el
@@ -87,6 +87,9 @@
 (let (preloaded-file-list site-load-packages need-to-dump dumped-exe)
   (load (expand-file-name "../lisp/dumped-lisp.el"))
 
+  (when (featurep 'utf-2000)
+    (load (expand-file-name "../lisp/utf-2000/dumped-chars.el")))
+
   (setq dumped-exe
 	(cond ((file-exists-p "../src/xemacs.exe") "../src/xemacs.exe")
 	      ((file-exists-p "../src/xemacs") "../src/xemacs")
@@ -106,7 +109,8 @@
   (setq preloaded-file-list
 	(append packages-hardcoded-lisp
 		preloaded-file-list
-		packages-useful-lisp
+		(if (featurep 'utf-2000)
+		    system-char-db-source-file-list)
 		site-load-packages))
   (while preloaded-file-list
     (let ((arg (car preloaded-file-list)))
@@ -131,25 +135,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
@@ -160,7 +164,7 @@
   )
 
 (setq update-elc-files-to-compile (append update-elc-files-to-compile
-					  processed))
+					  (nreverse processed)))
 
 ;; (print (prin1-to-string update-elc-files-to-compile))