Mercurial > hg > xemacs-beta

comparison lisp/startup.el @ 4669:2c1fa63dddbc

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
automatic merge
author Stephen J. Turnbull <stephen@xemacs.org>
date Tue, 28 Jul 2009 23:29:22 +0900
parents d71d2cefa42d
children fd36a980d701
comparison
equal deleted inserted replaced
4668:8b2a8ecf91cd 4669:2c1fa63dddbc
1522 inhibit-site-lisp: %S 1522 inhibit-site-lisp: %S
1523 called-early: %S 1523 called-early: %S
1524 " inhibit-packages inhibit-site-lisp called-early) 1524 " inhibit-packages inhibit-site-lisp called-early)
1525 'external-debugging-output) 1525 'external-debugging-output)
1526 (princ (format 1526 (princ (format
1527 "emacs-roots: 1527 "invocation-directory: %S
1528 invocation-name: %S
1529 configure-prefix-directory: %S
1530 configure-exec-prefix-directory: %S
1531 emacs-roots:
1528 %S 1532 %S
1529 emacs-data-roots: 1533 emacs-data-roots:
1530 %S 1534 %S
1531 user-init-directory: %S 1535 user-init-directory: %S
1532 configure-package-path: %S 1536 configure-package-path: %S
1533 " emacs-roots emacs-data-roots user-init-directory configure-package-path) 1537 " invocation-directory invocation-name
1538 configure-prefix-directory configure-exec-prefix-directory
1539 emacs-roots emacs-data-roots user-init-directory configure-package-path)
1534 'external-debugging-output) 1540 'external-debugging-output)
1535 ) 1541 )
1536 1542
1537 (setq lisp-directory (paths-find-lisp-directory emacs-roots)) 1543 (setq lisp-directory (paths-find-lisp-directory emacs-data-roots))
1538 1544
1539 (if debug-paths 1545 (if debug-paths
1540 (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"
1541 configure-lisp-directory lisp-directory) 1547 configure-lisp-directory lisp-directory)
1542 'external-debugging-output)) 1548 'external-debugging-output))
1543 1549
1544 (if (featurep 'mule) 1550 (if (featurep 'mule)
1545 (progn 1551 (progn
1546 (setq mule-lisp-directory 1552 (setq mule-lisp-directory
1547 (paths-find-mule-lisp-directory emacs-roots 1553 (paths-find-mule-lisp-directory emacs-data-roots
1548 lisp-directory)) 1554 lisp-directory))
1549 (if debug-paths 1555 (if debug-paths
1550 (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"
1551 configure-mule-lisp-directory mule-lisp-directory) 1557 configure-mule-lisp-directory mule-lisp-directory)
1552 'external-debugging-output))) 1558 'external-debugging-output)))
1553 (setq mule-lisp-directory '())) 1559 (setq mule-lisp-directory '()))
1554 1560
1555 (setq site-directory (and (null inhibit-site-lisp) 1561 (setq site-directory (and (null inhibit-site-lisp)
1556 (paths-find-site-lisp-directory emacs-roots))) 1562 (paths-find-site-lisp-directory emacs-data-roots)))
1557 1563
1558 (if (and debug-paths (null inhibit-site-lisp)) 1564 (if (and debug-paths (null inhibit-site-lisp))
1559 (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"
1560 configure-site-directory site-directory) 1566 configure-site-directory site-directory)
1561 'external-debugging-output)) 1567 'external-debugging-output))
1595 site-module-directory)) 1601 site-module-directory))
1596 1602
1597 (unless called-early 1603 (unless called-early
1598 (setq Info-directory-list 1604 (setq Info-directory-list
1599 (paths-construct-info-path 1605 (paths-construct-info-path
1600 emacs-roots 1606 emacs-data-roots
1601 early-package-hierarchies late-package-hierarchies last-package-hierarchies)) 1607 early-package-hierarchies late-package-hierarchies last-package-hierarchies))
1602 1608
1603 (if debug-paths 1609 (if debug-paths
1604 (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"
1605 configure-info-directory configure-info-path Info-directory-list) 1611 configure-info-directory configure-info-path Info-directory-list)
1626 (if debug-paths 1632 (if debug-paths
1627 (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"
1628 configure-doc-directory doc-directory) 1634 configure-doc-directory doc-directory)
1629 'external-debugging-output)) 1635 'external-debugging-output))
1630 1636
1631 (setq data-directory (paths-find-data-directory emacs-roots)) 1637 (setq data-directory (paths-find-data-directory emacs-data-roots))
1632 1638
1633 (if debug-paths 1639 (if debug-paths
1634 (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"
1635 configure-data-directory data-directory) 1641 configure-data-directory data-directory)
1636 'external-debugging-output)) 1642 'external-debugging-output))