comparing with /Sources/xemacs-carbon2 searching for changes changeset: 4496:50032b8a0b6e tag: tip user: Aidan Kehoe <kehoea(a)parhasard.net&gt; date: Sat Jun 07 23:17:10 2008 +0200 summary: Respect carbon conventions with packages, init file; prefer Unix init files. diff -r 69a3c4746f44 -r 50032b8a0b6e lisp/ChangeLog --- a/lisp/ChangeLog Sat May 24 09:57:12 2008 +0200 +++ b/lisp/ChangeLog Sat Jun 07 23:17:10 2008 +0200 ＠＠ -1,3 +1,17 ＠＠ 2008-05-14 Stephen J. Turnbull <stephe +2008-06-07 Aidan Kehoe <kehoea(a)parhasard.net&gt; + + * setup-paths.el (carbon-application-support-base): + New variable, set up to be a sensible default with Carbon + support. + (carbon-user-init-directory): + Ditto. + * startup.el (find-user-init-file): + If we're in a carbon build, prefer the Carbon-specific init + directory to the Unix init directory. + * startup.el (ask-about-user-init-file-migration-p): + If we're on a carbon build, note that when determining if init + file migration is relevant. + 2008-05-14 Stephen J. Turnbull <stephen(a)xemacs.org&gt; * subr.el (add-to-list): Fix Aidan's last commit. diff -r 69a3c4746f44 -r 50032b8a0b6e lisp/setup-paths.el --- a/lisp/setup-paths.el Sat May 24 09:57:12 2008 +0200 +++ b/lisp/setup-paths.el Sat Jun 07 23:17:10 2008 +0200 ＠＠ -69,6 +69,15 ＠＠ ("usr" "share" "info"))) "Directories appended to the end of the info path by default.") +(defvar carbon-application-support-base + "Library/Application Support/XEmacs" + "Root under / and ~/ where Carbon XEmacs also looks for init, package files.") + +(defvar carbon-user-init-directory + (file-name-as-directory + (paths-construct-path (list (concat "~/" carbon-application-support-base + "/")))) + "Carbon user init directory, checked if `user-init-directory' not available.")  ;;; Basic utility functions. ＠＠ -109,7 +118,7 ＠＠ installation roots." ;; searching for a package directory (and - (string-match "win32" system-configuration) + (or (string-match "win32" system-configuration) (featurep 'carbon)) (paths-file-readable-directory-p (paths-construct-path (list directory "xemacs-packages")))))) ＠＠ -145,13 +154,18 ＠＠ ROOT-P is a function that tests whether invocation-name root-p)) (potential-installation-roots - (paths-uniq-append - (and configure-exec-prefix-directory - (list (file-name-as-directory - configure-exec-prefix-directory))) - (and configure-prefix-directory - (list (file-name-as-directory - configure-prefix-directory))))) + (nconc + (paths-uniq-append + (and configure-exec-prefix-directory + (list (file-name-as-directory + configure-exec-prefix-directory))) + (and configure-prefix-directory + (list (file-name-as-directory + configure-prefix-directory)))) + (and + (featurep 'carbon) + (list (concat "/" carbon-application-support-base + "/XEmacs Packages/"))))) (installation-roots (paths-filter root-p potential-installation-roots))) (paths-uniq-append invocation-roots diff -r 69a3c4746f44 -r 50032b8a0b6e lisp/startup.el --- a/lisp/startup.el Sat May 24 09:57:12 2008 +0200 +++ b/lisp/startup.el Sat Jun 07 23:17:10 2008 +0200 ＠＠ -855,12 +855,17 ＠＠ the menubar)." (if load-home-init-file (find-user-home-directory-init-file home-directory) (or (find-user-init-directory-init-file init-directory) + (and (featurep 'carbon) + (find-user-init-directory-init-file carbon-user-init-directory)) (find-user-home-directory-init-file home-directory)))) (defun ask-about-user-init-file-migration-p () "Check whether we want to ask the user if she wants to migrate the init file." (and (not load-home-init-file) (not (find-user-init-directory-init-file user-init-directory)) + (not (and (featurep 'carbon) + (find-user-init-directory-init-file + carbon-user-init-directory))) (stringp user-init-file) (file-readable-p user-init-file))) -- ¿Dónde estará ahora mi sobrino Yoghurtu Nghé, que tuvo que huir precipitadamente de la aldea por culpa de la escasez de rinocerontes? _______________________________________________ XEmacs-Patches mailing list XEmacs-Patches(a)xemacs.org http://calypso.tux.org/cgi-bin/mailman/listinfo/xemacs-patches