(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 33cbff0c7285b393e5e69b298ad90c5317936943..96536a1b4a1adb4be0c972e688eb59ba0350d476 100644 (file)
--- a/lisp/paths.el
+++ b/lisp/paths.el
@@ -18,8 +18,9 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License

-;; along with GNU Emacs; see the file COPYING.  If not, write to
-;; the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+;; along with GNU Emacs; see the file COPYING.  If not, write to the
+;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+;; Boston, MA 02111-1307, USA.

 
 ;;; Commentary:
 
 
 ;;; Commentary:
 


@@ -43,18 +44,27 @@
        (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).

 
 

-(defvar news-path "/usr/spool/news/"
+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/")
+      "/usr/spool/news/"
+    "/var/spool/news/")

   "The root directory below which all news files are stored.")
 
 (defvar news-inews-program
   (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")
   "The root directory below which all news files are stored.")
 
 (defvar news-inews-program
   (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.")


@@ -69,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.")


@@ -98,6 +102,9 @@ Will use `gnus-startup-file'-SERVER instead if exists.")
        ;; let's assume this dir is never used for anything else.
        ((file-exists-p "/var/mail")
         "/var/mail/")
        ;; let's assume this dir is never used for anything else.
        ((file-exists-p "/var/mail")
         "/var/mail/")

+       ;; Many GNU/Linux systems use this name.
+       ((file-exists-p "/var/spool/mail")
+        "/var/spool/mail/")

        ((memq system-type '(dgux hpux usg-unix-v unisoft-unix rtu irix))
         "/usr/mail/")
        (t "/usr/spool/mail/"))
        ((memq system-type '(dgux hpux usg-unix-v unisoft-unix rtu irix))
         "/usr/mail/")
        (t "/usr/spool/mail/"))


@@ -128,6 +135,8 @@ Its name should end with a slash.")
    ((file-exists-p "/usr/ucb/rsh") "/usr/ucb/rsh")
    ((file-exists-p "/usr/bsd/rsh") "/usr/bsd/rsh")
    ((file-exists-p "/usr/local/bin/rsh") "/usr/local/bin/rsh")
    ((file-exists-p "/usr/ucb/rsh") "/usr/ucb/rsh")
    ((file-exists-p "/usr/bsd/rsh") "/usr/bsd/rsh")
    ((file-exists-p "/usr/local/bin/rsh") "/usr/local/bin/rsh")

+   ((file-exists-p "/usr/bin/rcmd") "/usr/bin/rcmd")
+   ((file-exists-p "/bin/rcmd") "/bin/rcmd")

    ((file-exists-p "/bin/rsh") "/bin/rsh")
    ((file-exists-p "/usr/bin/rsh") "/usr/bin/rsh")
    (t "rsh")))
    ((file-exists-p "/bin/rsh") "/bin/rsh")
    ((file-exists-p "/usr/bin/rsh") "/usr/bin/rsh")
    (t "rsh")))


@@ -140,7 +149,7 @@ the terminal-initialization file to be loaded.")
 (defconst abbrev-file-name 
   (if (eq system-type 'vax-vms)
       "~/abbrev.def"
 (defconst abbrev-file-name 
   (if (eq system-type 'vax-vms)
       "~/abbrev.def"

-    "~/.abbrev_defs")
+    (convert-standard-filename "~/.abbrev_defs"))

   "*Default name of file to read abbrevs from.")
 
 ;;; paths.el ends here
   "*Default name of file to read abbrevs from.")
 
 ;;; paths.el ends here