(describe_category_1): Pass new args to describe_vector.

[gnu-emacs] / lisp / paths.el

diff --git a/lisp/paths.el b/lisp/paths.el
index 842dab1534ba9e4a266d49c47dd3cfc53472f8d7..96536a1b4a1adb4be0c972e688eb59ba0350d476 100644 (file)
--- a/lisp/paths.el
+++ b/lisp/paths.el
@@ -44,10 +44,15 @@
        (configdir (file-name-as-directory configure-info-directory)))
     (setq start (nconc start (list configdir)))
     start)
        (configdir (file-name-as-directory configure-info-directory)))
     (setq start (nconc start (list configdir)))
     start)

-  "List of directories to search for Info documentation files.
-They are searched in the order they are given in this list.
+  "Default list of directories to search for Info documentation files.
+They are searched in the order they are given in the list.

 Therefore, the directory of Info files that come with Emacs
 Therefore, the directory of Info files that come with Emacs

-normally should come last (so that local files override standard ones).")
+normally should come last (so that local files override standard ones).
+
+Once Info is started, the list of directories to search
+comes from the variable `Info-directory-list'.
+This variable `Info-default-directory-list' is used as the default
+for initializing `Info-directory-list' when Info is started.")

 
 (defvar news-path
   (if (file-exists-p "/usr/spool/news/")
 
 (defvar news-path
   (if (file-exists-p "/usr/spool/news/")


@@ -59,6 +64,7 @@ normally should come last (so that local files override standard ones).")
   (cond ((file-exists-p "/usr/bin/inews") "/usr/bin/inews")
        ((file-exists-p "/usr/local/inews") "/usr/local/inews")
        ((file-exists-p "/usr/local/bin/inews") "/usr/local/bin/inews")
   (cond ((file-exists-p "/usr/bin/inews") "/usr/bin/inews")
        ((file-exists-p "/usr/local/inews") "/usr/local/inews")
        ((file-exists-p "/usr/local/bin/inews") "/usr/local/bin/inews")

+       ((file-exists-p "/usr/contrib/lib/news/inews") "/usr/contrib/lib/news/inews")

        ((file-exists-p "/usr/lib/news/inews") "/usr/lib/news/inews")
        (t "inews"))
   "Program to post news.")
        ((file-exists-p "/usr/lib/news/inews") "/usr/lib/news/inews")
        (t "inews"))
   "Program to post news.")


@@ -73,12 +79,6 @@ The null string means use the local host as the server site.")
 Go to a local news spool if its value is nil, in which case `gnus-nntp-server'
 should be set to `(system-name)'.")
 
 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 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 nil
   "*The name of your organization, as a string.
 The `ORGANIZATION' environment variable is used instead if defined.")
 (defvar gnus-local-organization nil
   "*The name of your organization, as a string.
 The `ORGANIZATION' environment variable is used instead if defined.")