[Emacs-diffs] Changes to emacs/lisp/paths.el [emacs-unicode-2]

[Miles Bader]

Index: emacs/lisp/paths.el
diff -c emacs/lisp/paths.el:1.65.6.1 emacs/lisp/paths.el:1.65.6.2
*** emacs/lisp/paths.el:1.65.6.1        Fri Apr 16 12:50:08 2004
--- emacs/lisp/paths.el Fri Oct 22 10:13:29 2004
***************
*** 101,111 ****
  for initializing `Info-directory-list' when Info is started, unless
  the environment variable INFOPATH is set.")
  
! (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")
--- 101,112 ----
  for initializing `Info-directory-list' when Info is started, unless
  the environment variable INFOPATH is set.")
  
! (defvar news-directory
    (if (file-exists-p "/usr/spool/news/")
        "/usr/spool/news/"
      "/var/spool/news/")
    "The root directory below which all news files are stored.")
+ (defvaralias 'news-path 'news-directory)
  
  (defvar news-inews-program
    (cond ((file-exists-p "/usr/bin/inews") "/usr/bin/inews")
***************
*** 136,142 ****
    :group 'rmail
    :version "21.1")
  
! (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
--- 137,143 ----
    :group 'rmail
    :version "21.1")
  
! (defvar rmail-spool-directory
    (cond ((string-match "^[^-]+-[^-]+-sco3.2v4" system-configuration)
         "/usr/spool/mail/")
        ;; On The Bull DPX/2 /usr/spool/mail is used although
***************
*** 157,171 ****
    "Name of directory used by system mailer for delivering new mail.
  Its name should end with a slash.")
  
! (defconst sendmail-program
    (cond
      ((file-exists-p "/usr/sbin/sendmail") "/usr/sbin/sendmail")
      ((file-exists-p "/usr/lib/sendmail") "/usr/lib/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 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
--- 158,174 ----
    "Name of directory used by system mailer for delivering new mail.
  Its name should end with a slash.")
  
! (defcustom sendmail-program
    (cond
      ((file-exists-p "/usr/sbin/sendmail") "/usr/sbin/sendmail")
      ((file-exists-p "/usr/lib/sendmail") "/usr/lib/sendmail")
      ((file-exists-p "/usr/ucblib/sendmail") "/usr/ucblib/sendmail")
      (t "fakemail"))                   ;In ../etc, to interface to /bin/mail.
!   "Program used to send messages."
!   :group 'mail
!   :type 'file)
  
! (defcustom 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
***************
*** 186,199 ****
     ((file-exists-p "/bin/rsh") "/bin/rsh")
     ((file-exists-p "/usr/bin/rsh") "/usr/bin/rsh")
     (t "rsh"))
!   "File name for remote-shell program (often rsh or remsh).")
  
! (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
  the terminal-initialization file to be loaded.")
  
! (defconst abbrev-file-name
    (if (eq system-type 'vax-vms)
        "~/abbrev.def"
      (convert-standard-filename "~/.abbrev_defs"))
--- 189,204 ----
     ((file-exists-p "/bin/rsh") "/bin/rsh")
     ((file-exists-p "/usr/bin/rsh") "/usr/bin/rsh")
     (t "rsh"))
!   "File name for remote-shell program (often rsh or remsh)."
!   :group 'environment
!   :type 'file)
  
! (defvar 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
  the terminal-initialization file to be loaded.")
  
! (defvar abbrev-file-name
    (if (eq system-type 'vax-vms)
        "~/abbrev.def"
      (convert-standard-filename "~/.abbrev_defs"))