(xscheme-control-g-synchronization-p): Doc fix.

[gnu-emacs] / lisp / paths.el

diff --git a/lisp/paths.el b/lisp/paths.el
index 9b63d59063d887a8f9e23bb0b7cb3c867ea5c51e..12292e2bb1ae3ad6106e4f3a2df1490bc9050bb9 100644 (file)
--- a/lisp/paths.el
+++ b/lisp/paths.el
@@ -48,7 +48,10 @@ They are searched in the order they are given in this list.
 Therefore, the directory of Info files that come with Emacs
 normally should come last (so that local files override standard ones).")
 
-(defvar news-path "/usr/spool/news/"
+(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
@@ -62,9 +65,7 @@ normally should come last (so that local files override standard ones).")
 (defvar gnus-default-nntp-server ""
   ;; set this to your local server
   "The name of the host running an NNTP server.
-If it is a string such as \":DIRECTORY\", then ~/DIRECTORY
-is used as a news spool.  `gnus-nntp-server' is initialised from NNTPSERVER
-environment variable or, if none, this value.")
+The null string means use the local host as the server site.")
 
 (defvar gnus-nntp-service "nntp"
   "NNTP service name, usually \"nntp\" or 119).
@@ -91,11 +92,18 @@ Will use `gnus-startup-file'-SERVER instead if exists.")
 (defconst rmail-spool-directory
   (cond ((string-match "^[^-]+-[^-]+-sco3.2v4" system-configuration)
         "/usr/spool/mail/")
+       ;; On The Bull DPX/2 /usr/spool/mail is used although 
+       ;; it is usg-unix-v.
+       ((string-match "^m68k-bull-sysv3" system-configuration)
+        "/usr/spool/mail/")
        ;; SVR4 and recent BSD are said to use this.
        ;; Rather than trying to know precisely which systems use it,
        ;; 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/"))
@@ -110,6 +118,28 @@ Its name should end with a slash.")
     (t "fakemail"))                    ;In ../etc, to interface to /bin/mail.
   "Program used to send messages.")
 
+(defconst remote-shell-program
+  (cond
+   ;; Some systems use rsh for the remote shell; others use that name for the
+   ;; restricted shell and use remsh for the remote shell.  Let's try to guess
+   ;; based on what we actually find out there.  The restricted shell is
+   ;; almost certainly in /bin or /usr/bin, so it's probably safe to assume
+   ;; that an rsh found elsewhere is the remote shell program.  The converse
+   ;; is not true: /usr/bin/rsh could be either one, so check that last.
+   ((file-exists-p "/usr/ucb/remsh") "/usr/ucb/remsh")
+   ((file-exists-p "/usr/bsd/remsh") "/usr/bsd/remsh")
+   ((file-exists-p "/bin/remsh") "/bin/remsh")
+   ((file-exists-p "/usr/bin/remsh") "/usr/bin/remsh")
+   ((file-exists-p "/usr/local/bin/remsh") "/usr/local/bin/remsh")
+   ((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")))
+
 (defconst term-file-prefix (if (eq system-type 'vax-vms) "[.term]" "term/")
   "If non-nil, Emacs startup does (load (concat term-file-prefix (getenv \"TERM\")))
 You may set this variable to nil in your `.emacs' file if you do not wish
@@ -118,7 +148,7 @@ the terminal-initialization file to be loaded.")
 (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