Merge from mainline.

[gnu-emacs] / lisp / paths.el

diff --git a/lisp/paths.el b/lisp/paths.el
index 2e2ab6584fea43a72d2a60ce7e03d39b65ea5dd4..161caf9cb8c440d536fa35815223605297d144cf 100644 (file)
--- a/lisp/paths.el
+++ b/lisp/paths.el
@@ -1,17 +1,17 @@
 ;;; paths.el --- define pathnames for use by various Emacs commands -*- no-byte-compile: t -*-
 
 ;;; paths.el --- define pathnames for use by various Emacs commands -*- no-byte-compile: t -*-
 

-;; Copyright (C) 1986, 1988, 1994, 1999, 2000, 2001, 2002, 2003,
-;;   2004, 2005, 2006, 2007 Free Software Foundation, Inc.
+;; Copyright (C) 1986, 1988, 1994, 1999-2011  Free Software Foundation, Inc.

 
 ;; Maintainer: FSF
 ;; Keywords: internal
 
 ;; Maintainer: FSF
 ;; Keywords: internal

+;; Package: emacs

 
 ;; This file is part of GNU Emacs.
 
 
 ;; This file is part of GNU Emacs.
 

-;; GNU Emacs is free software; you can redistribute it and/or modify
+;; GNU Emacs is free software: you can redistribute it and/or modify

 ;; it under the terms of the GNU General Public License as published by
 ;; it under the terms of the GNU General Public License as published by

-;; the Free Software Foundation; either version 2, or (at your option)
-;; any later version.
+;; the Free Software Foundation, either version 3 of the License, or
+;; (at your option) any later version.

 
 ;; GNU Emacs is distributed in the hope that it will be useful,
 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of


@@ -19,9 +19,7 @@
 ;; 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, Inc., 51 Franklin Street, Fifth Floor,
-;; Boston, MA 02110-1301, USA.
+;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.

 
 ;;; Commentary:
 
 
 ;;; Commentary:
 


@@ -34,11 +32,12 @@
 ;;; Code:
 
 ;; Docstrings in this file should, where reasonable, follow the
 ;;; Code:
 
 ;; Docstrings in this file should, where reasonable, follow the

-;; conventions described in bindings.el, so that they get put in the
+;; conventions described in make-docfile, so that they get put in the

 ;; DOC file rather than in memory.
 
 (defun prune-directory-list (dirs &optional keep reject)
 ;; DOC file rather than in memory.
 
 (defun prune-directory-list (dirs &optional keep reject)

-  "Returns a copy of DIRS with all non-existent directories removed.
+  "\
+Return a copy of DIRS with all non-existent directories removed.

 The optional argument KEEP is a list of directories to retain even if
 they don't exist, and REJECT is a list of directories to remove from
 DIRS, even if they exist; REJECT takes precedence over KEEP.
 The optional argument KEEP is a list of directories to retain even if
 they don't exist, and REJECT is a list of directories to remove from
 DIRS, even if they exist; REJECT takes precedence over KEEP.


@@ -59,7 +58,7 @@ comparison."
          (list config-dir))
         (unpruned-prefixes
          ;; Directory trees that may not exist at installation time, and
          (list config-dir))
         (unpruned-prefixes
          ;; Directory trees that may not exist at installation time, and

-         ;; so shouldn't be pruned based on existance.
+         ;; so shouldn't be pruned based on existence.

          '("/usr/local/"))
         (prefixes
          ;; Directory trees in which to look for info subdirectories
          '("/usr/local/"))
         (prefixes
          ;; Directory trees in which to look for info subdirectories


@@ -103,28 +102,29 @@ for initializing `Info-directory-list' when Info is started, unless
 the environment variable INFOPATH is set.")
 
 (defvar news-directory
 the environment variable INFOPATH is set.")
 
 (defvar news-directory

-  (if (file-exists-p "/usr/spool/news/")
+  (purecopy (if (file-exists-p "/usr/spool/news/")

       "/usr/spool/news/"
       "/usr/spool/news/"

-    "/var/spool/news/")
+    "/var/spool/news/"))

   "The root directory below which all news files are stored.")
 (defvaralias 'news-path 'news-directory)
 
 (defvar news-inews-program
   "The root directory below which all news files are stored.")
 (defvaralias 'news-path 'news-directory)
 
 (defvar news-inews-program

+  (purecopy

   (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")
   (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"))
+       (t "inews")))

   "Program to post news.")
 
 ;; set this to your local server
   "Program to post news.")
 
 ;; set this to your local server

-(defvar gnus-default-nntp-server "" "\
+(defvar gnus-default-nntp-server (purecopy "") "\

 The name of the host running an NNTP server.
 The null string means use the local host as the server site.")
 
 The name of the host running an NNTP server.
 The null string means use the local host as the server site.")
 

-(defvar gnus-nntp-service "nntp"
-  "NNTP service name, usually \"nntp\" or 119).
+(defvar gnus-nntp-service (purecopy "nntp") "\
+NNTP service name, usually \"nntp\" or 119.

 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)'.")
 


@@ -132,34 +132,30 @@ should be set to `(system-name)'.")
 *The name of your organization, as a string.
 The `ORGANIZATION' environment variable is used instead if defined.")
 
 *The name of your organization, as a string.
 The `ORGANIZATION' environment variable is used instead if defined.")
 

-(defcustom rmail-file-name "~/RMAIL"
-  "*Name of user's primary mail file."
+(defcustom rmail-file-name (purecopy "~/RMAIL") "\
+Name of user's primary mail file."

   :type 'string
   :group 'rmail
   :version "21.1")
 
 (defvar rmail-spool-directory
   :type 'string
   :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
-       ;; 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")
+  (purecopy
+  (cond ((file-exists-p "/var/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.

         "/var/mail/")
        ;; Many GNU/Linux systems use this name.
        ((file-exists-p "/var/spool/mail")
         "/var/spool/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))
+       ((memq system-type '(hpux usg-unix-v irix))

         "/usr/mail/")
         "/usr/mail/")

-       (t "/usr/spool/mail/"))
+       (t "/usr/spool/mail/")))

   "Name of directory used by system mailer for delivering new mail.
 Its name should end with a slash.")
 
 (defcustom remote-shell-program
   "Name of directory used by system mailer for delivering new mail.
 Its name should end with a slash.")
 
 (defcustom remote-shell-program

+  (purecopy

   (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
   (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


@@ -179,21 +175,14 @@ Its name should end with a slash.")
    ((file-exists-p "/bin/rcmd") "/bin/rcmd")
    ((file-exists-p "/bin/rsh") "/bin/rsh")
    ((file-exists-p "/usr/bin/rsh") "/usr/bin/rsh")
    ((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"))
+   (t "rsh")))

   "File name for remote-shell program (often rsh or remsh)."
   :group 'environment
   :type 'file)
 
   "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/") "\
+(defvar term-file-prefix (purecopy "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.")
 
 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"))
-  "*Default name of file to read abbrevs from.")
-
-;;; arch-tag: bae27ffb-9944-4c87-b569-30d4635a99e1

 ;;; paths.el ends here
 ;;; paths.el ends here