Mercurial > hg > xemacs-beta

comparison lisp/startup.el @ 4664:d71d2cefa42d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Use `emacs-data-roots' instead of `emacs-roots' where appropriate.
author Mike Sperber <sperber@deinprogramm.de>
date Tue, 28 Jul 2009 15:56:22 +0200
parents a597b89c2db9
children fd36a980d701
comparison
equal deleted inserted replaced
4663:5220dbba8ccd 4664:d71d2cefa42d
1538 configure-prefix-directory configure-exec-prefix-directory 1538 configure-prefix-directory configure-exec-prefix-directory
1539 emacs-roots emacs-data-roots user-init-directory configure-package-path) 1539 emacs-roots emacs-data-roots user-init-directory configure-package-path)
1540 'external-debugging-output) 1540 'external-debugging-output)
1541 ) 1541 )
1542 1542
1543 (setq lisp-directory (paths-find-lisp-directory emacs-roots)) 1543 (setq lisp-directory (paths-find-lisp-directory emacs-data-roots))
1544 1544
1545 (if debug-paths 1545 (if debug-paths
1546 (princ (format "configure-lisp-directory and lisp-directory:\n%S\n%S\n" 1546 (princ (format "configure-lisp-directory and lisp-directory:\n%S\n%S\n"
1547 configure-lisp-directory lisp-directory) 1547 configure-lisp-directory lisp-directory)
1548 'external-debugging-output)) 1548 'external-debugging-output))
1549 1549
1550 (if (featurep 'mule) 1550 (if (featurep 'mule)
1551 (progn 1551 (progn
1552 (setq mule-lisp-directory 1552 (setq mule-lisp-directory
1553 (paths-find-mule-lisp-directory emacs-roots 1553 (paths-find-mule-lisp-directory emacs-data-roots
1554 lisp-directory)) 1554 lisp-directory))
1555 (if debug-paths 1555 (if debug-paths
1556 (princ (format "configure-mule-lisp-directory and mule-lisp-directory:\n%S\n%S\n" 1556 (princ (format "configure-mule-lisp-directory and mule-lisp-directory:\n%S\n%S\n"
1557 configure-mule-lisp-directory mule-lisp-directory) 1557 configure-mule-lisp-directory mule-lisp-directory)
1558 'external-debugging-output))) 1558 'external-debugging-output)))
1559 (setq mule-lisp-directory '())) 1559 (setq mule-lisp-directory '()))
1560 1560
1561 (setq site-directory (and (null inhibit-site-lisp) 1561 (setq site-directory (and (null inhibit-site-lisp)
1562 (paths-find-site-lisp-directory emacs-roots))) 1562 (paths-find-site-lisp-directory emacs-data-roots)))
1563 1563
1564 (if (and debug-paths (null inhibit-site-lisp)) 1564 (if (and debug-paths (null inhibit-site-lisp))
1565 (princ (format "configure-site-directory and site-directory:\n%S\n%S\n" 1565 (princ (format "configure-site-directory and site-directory:\n%S\n%S\n"
1566 configure-site-directory site-directory) 1566 configure-site-directory site-directory)
1567 'external-debugging-output)) 1567 'external-debugging-output))
1601 site-module-directory)) 1601 site-module-directory))
1602 1602
1603 (unless called-early 1603 (unless called-early
1604 (setq Info-directory-list 1604 (setq Info-directory-list
1605 (paths-construct-info-path 1605 (paths-construct-info-path
1606 emacs-roots 1606 emacs-data-roots
1607 early-package-hierarchies late-package-hierarchies last-package-hierarchies)) 1607 early-package-hierarchies late-package-hierarchies last-package-hierarchies))
1608 1608
1609 (if debug-paths 1609 (if debug-paths
1610 (princ (format "configure-info-directory, configure-info-path and Info-directory-list:\n%S\n%S\n%S\n" 1610 (princ (format "configure-info-directory, configure-info-path and Info-directory-list:\n%S\n%S\n%S\n"
1611 configure-info-directory configure-info-path Info-directory-list) 1611 configure-info-directory configure-info-path Info-directory-list)
1632 (if debug-paths 1632 (if debug-paths
1633 (princ (format "configure-doc-directory and doc-directory:\n%S\n%S\n" 1633 (princ (format "configure-doc-directory and doc-directory:\n%S\n%S\n"
1634 configure-doc-directory doc-directory) 1634 configure-doc-directory doc-directory)
1635 'external-debugging-output)) 1635 'external-debugging-output))
1636 1636
1637 (setq data-directory (paths-find-data-directory emacs-roots)) 1637 (setq data-directory (paths-find-data-directory emacs-data-roots))
1638 1638
1639 (if debug-paths 1639 (if debug-paths
1640 (princ (format "configure-data-directory and data-directory:\n%S\n%S\n" 1640 (princ (format "configure-data-directory and data-directory:\n%S\n%S\n"
1641 configure-data-directory data-directory) 1641 configure-data-directory data-directory)
1642 'external-debugging-output)) 1642 'external-debugging-output))