X-Git-Url: https://code.delx.au/gnu-emacs/blobdiff_plain/4c149073d57422efb1f7414d6b1323636f4aa498..9c85ef9fe1dfc4f825647670f46ad21b8501bf0a:/lisp/paths.el diff --git a/lisp/paths.el b/lisp/paths.el index b618f0186c..ea97278faf 100644 --- a/lisp/paths.el +++ b/lisp/paths.el @@ -32,11 +32,16 @@ ;;; Code: (defvar Info-default-directory-list - (list "/usr/local/info/" - "/usr/local/lib/info/" - configure-info-directory - (expand-file-name "../info/" data-directory) - (expand-file-name "../../info/" data-directory)) + (let ((start (list "/usr/local/info/" + "/usr/local/lib/info/")) + (configdir (file-name-as-directory configure-info-directory))) + (or (member configdir start) + (setq start (nconc start (list configdir)))) + (or (member (expand-file-name "../info/" data-directory) start) + (setq start + (nconc start + (list (expand-file-name "../info/" data-directory))))) + start) "List of directories to search for Info documentation files.") (defvar news-path "/usr/spool/news/" @@ -63,13 +68,13 @@ Go to a local news spool if its value is nil, in which case `gnus-nntp-server' should be set to `(system-name)'.") (defvar gnus-local-domain nil - "Your domain name without your host name like: \"stars.flab.Fujitsu.CO.JP\" -The DOMAINNAME environment variable is used instead if defined. If -the function `system-name' returns a fully qualified domain name, there is no -need to define the name.") + "*Your domain name without a host name: for example, \"ai.mit.edu\". +The DOMAINNAME environment variable is used instead if defined. +If the function `system-name' returns a fully qualified domain name, +there is no need to set this variable.") -(defvar gnus-local-organization "" - "Your organization like: \"Fujitsu Laboratories Ltd., Kawasaki, Japan.\" +(defvar gnus-local-organization nil + "*The name of your organization, as a string. The `ORGANIZATION' environment variable is used instead if defined.") (defvar mh-progs @@ -103,11 +108,11 @@ Will use `gnus-startup-file'-SERVER instead if exists.") Its name should end with a slash.") (defconst sendmail-program - (if (file-exists-p "/usr/lib/sendmail") - "/usr/lib/sendmail" - (if (file-exists-p "/usr/ucblib/sendmail") - "/usr/ucblib/sendmail" - "fakemail")) ;In ../etc, to interface to /bin/mail. + (cond + ((file-exists-p "/usr/lib/sendmail") "/usr/lib/sendmail") + ((file-exists-p "/usr/sbin/sendmail") "/usr/sbin/sendmail") + ((file-exists-p "/usr/ucblib/sendmail") "/usr/ucblib/sendmail") + (t "fakemail")) ;In ../etc, to interface to /bin/mail. "Program used to send messages.") (defconst term-file-prefix (if (eq system-type 'vax-vms) "[.term]" "term/") @@ -121,62 +126,6 @@ the terminal-initialization file to be loaded.") "/usr/ucb/man" "/usr/bin/man") "Program to run to print man pages.") -;; Note that /usr/man/cat is not really right for this on sysV; nothing is, -;; judging by the list of directories below. You can't get the dir -;; for a section by appending the section number to any one prefix. -;; But it turns out that a string that's wrong does no harm here. -(defconst manual-formatted-dir-prefix - (if (file-exists-p "/usr/man/cat.C") ;; Check for Xenix. - "/usr/man/cat." "/usr/man/cat") - "Prefix for directories containing formatted manual pages. -Append a section-number or section-name to get a directory name.") - -(defconst manual-formatted-dirlist - (cond ((eq system-type 'hpux) - '("/usr/man/cat1" "/usr/man/cat2" "/usr/man/cat3" - "/usr/man/cat4" "/usr/man/cat5" "/usr/man/cat6" - "/usr/man/cat7" "/usr/man/cat1m" "/usr/man/cat8" - "/usr/local/man/cat1" "/usr/local/man/cat2" "/usr/local/man/cat3" - "/usr/local/man/cat4" "/usr/local/man/cat5" "/usr/local/man/cat6" - "/usr/local/man/cat7" "/usr/local/man/cat1m" "/usr/local/man/cat8" - "/usr/contrib/man/cat1" "/usr/contrib/man/cat2" - "/usr/contrib/man/cat3" "/usr/contrib/man/cat4" - "/usr/contrib/man/cat5" "/usr/contrib/man/cat6" - "/usr/contrib/man/cat7" "/usr/contrib/man/cat1m" - "/usr/contrib/man/cat8")) - ((file-exists-p "/usr/man/cat.C") ; Xenix - '("/usr/man/cat.C" "/usr/man/cat.CP" "/usr/man/cat.CT" - "/usr/man/cat.DOS/" "/usr/man/cat.F" "/usr/man/cat.HW" - "/usr/man/cat.M/" "/usr/man/cat.S" "/usr/man/cat.LOCAL")) - ((file-exists-p "/usr/man/cat3/cat3") - ;; This is for UMAX. - '("/usr/man/cat1" "/usr/man/cat2" - "/usr/man/cat3" "/usr/man/cat3/cat3" - "/usr/man/cat3/cat3b" "/usr/man/cat3/cat3c" - "/usr/man/cat3/cat3f" "/usr/man/cat3/cat3m" - "/usr/man/cat3/cat3n" "/usr/man/cat3/cat3p" - "/usr/man/cat3/cat3s" "/usr/man/cat3/cat3u" - "/usr/man/cat3/cat3x" "/usr/man/cat4" - "/usr/man/cat5" "/usr/man/cat6" - "/usr/man/cat7" "/usr/man/cat8" - "/usr/man/catl" "/usr/man/catn")) - ((file-exists-p "/usr/man/cat1") - '("/usr/man/cat1" "/usr/man/cat2" "/usr/man/cat3" - "/usr/man/cat4" "/usr/man/cat5" "/usr/man/cat6" - "/usr/man/cat7" "/usr/man/cat8" "/usr/man/catl" "/usr/man/catn")) - (t - '("/usr/catman/u_man/man1" "/usr/catman/u_man/man6" - "/usr/catman/p_man/man2" "/usr/catman/p_man/man3" - "/usr/catman/p_man/man4" "/usr/catman/p_man/man5" - "/usr/catman/a_man/man1" "/usr/catman/a_man/man7" - "/usr/catman/a_man/man8" "/usr/catman/local" - "/usr/catman/a_man/man8" "/usr/catman/local/man1" - "/usr/catman/local/man2" "/usr/catman/local/man3" - "/usr/catman/local/man4" "/usr/catman/local/man5" - "/usr/catman/local/man6" "/usr/catman/local/man7" - "/usr/catman/local/man8"))) - "List of directories containing formatted manual pages.") - (defconst abbrev-file-name (if (eq system-type 'vax-vms) "~/abbrev.def"