changeset: 4664:d71d2cefa42d
tag: tip
user: Mike Sperber <sperber(a)deinprogramm.de>
date: Tue Jul 28 15:56:22 2009 +0200
files: lisp/ChangeLog lisp/startup.el
description:
Use `emacs-data-roots' instead of `emacs-roots' where appropriate.
diff -r 5220dbba8ccd -r d71d2cefa42d lisp/ChangeLog
--- a/lisp/ChangeLog Tue Jul 28 15:55:18 2009 +0200
+++ b/lisp/ChangeLog Tue Jul 28 15:56:22 2009 +0200
@@ -1,3 +1,8 @@
+2009-07-28 Mike Sperber <mike(a)xemacs.org>
+
+ * startup.el (startup-setup-paths): Use `emacs-data-roots' instead
+ of `emacs-roots' where appropriate.
+
2009-07-28 Mike Sperber <mike(a)xemacs.org>
* startup.el (startup-setup-paths): Print a few more variables
diff -r 5220dbba8ccd -r d71d2cefa42d lisp/startup.el
--- a/lisp/startup.el Tue Jul 28 15:55:18 2009 +0200
+++ b/lisp/startup.el Tue Jul 28 15:56:22 2009 +0200
@@ -1540,7 +1540,7 @@
'external-debugging-output)
)
- (setq lisp-directory (paths-find-lisp-directory emacs-roots))
+ (setq lisp-directory (paths-find-lisp-directory emacs-data-roots))
(if debug-paths
(princ (format "configure-lisp-directory and lisp-directory:\n%S\n%S\n"
@@ -1550,7 +1550,7 @@
(if (featurep 'mule)
(progn
(setq mule-lisp-directory
- (paths-find-mule-lisp-directory emacs-roots
+ (paths-find-mule-lisp-directory emacs-data-roots
lisp-directory))
(if debug-paths
(princ (format "configure-mule-lisp-directory and
mule-lisp-directory:\n%S\n%S\n"
@@ -1559,7 +1559,7 @@
(setq mule-lisp-directory '()))
(setq site-directory (and (null inhibit-site-lisp)
- (paths-find-site-lisp-directory emacs-roots)))
+ (paths-find-site-lisp-directory emacs-data-roots)))
(if (and debug-paths (null inhibit-site-lisp))
(princ (format "configure-site-directory and site-directory:\n%S\n%S\n"
@@ -1603,7 +1603,7 @@
(unless called-early
(setq Info-directory-list
(paths-construct-info-path
- emacs-roots
+ emacs-data-roots
early-package-hierarchies late-package-hierarchies last-package-hierarchies))
(if debug-paths
@@ -1634,7 +1634,7 @@
configure-doc-directory doc-directory)
'external-debugging-output))
- (setq data-directory (paths-find-data-directory emacs-roots))
+ (setq data-directory (paths-find-data-directory emacs-data-roots))
(if debug-paths
(princ (format "configure-data-directory and data-directory:\n%S\n%S\n"
_______________________________________________
XEmacs-Patches mailing list
XEmacs-Patches(a)xemacs.org
http://calypso.tux.org/cgi-bin/mailman/listinfo/xemacs-patches