diff lisp/startup.el @ 460:223736d75acb r21-2-45

Import from CVS: tag r21-2-45
author cvs
date Mon, 13 Aug 2007 11:43:24 +0200
parents c33ae14dd6d0
children 8a548306e08d
line wrap: on
line diff
--- a/lisp/startup.el	Mon Aug 13 11:42:27 2007 +0200
+++ b/lisp/startup.el	Mon Aug 13 11:43:24 2007 +0200
@@ -1276,6 +1276,17 @@
       (princ (format "lisp-directory:\n%S\n" lisp-directory)
 	     'external-debugging-output))
 
+  (if (featurep 'mule)
+      (progn
+	(setq mule-lisp-directory
+	      (paths-find-mule-lisp-directory roots
+					      lisp-directory))
+	(if debug-paths
+	    (princ (format "mule-lisp-directory:\n%S\n"
+			   mule-lisp-directory)
+		   'external-debugging-output)))
+    (setq mule-lisp-directory '()))
+
   (setq site-directory (and (null inhibit-site-lisp)
 			    (paths-find-site-lisp-directory roots)))
 
@@ -1288,7 +1299,8 @@
 					     late-package-load-path
 					     last-package-load-path
 					     lisp-directory
-					     site-directory))
+					     site-directory
+					     mule-lisp-directory))
 
   (setq Info-directory-list
 	(paths-construct-info-path roots
@@ -1355,6 +1367,9 @@
 	(erase-buffer)
 	(buffer-disable-undo (current-buffer))
 	(if (null lisp-directory) (push "lisp-directory" warnings))
+	(if (and (featurep 'mule)
+		 (null mule-lisp-directory))
+	    (push "mule-lisp-directory" warnings))
 	(if (null exec-directory) (push "exec-directory" warnings))
 	(if (null data-directory) (push "data-directory" warnings))
 	(if (null doc-directory)  (push "doc-directory"  warnings))