(struct group): Add gr_gid member.

[gnu-emacs] / lisp / paths.el

diff --git a/lisp/paths.el b/lisp/paths.el
index f248eac9242311b54ae9a85b1045d18623fce0f0..6aece35b69e3bd2d2ff337c0f2bc65ce5390b9dd 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 -*-
 
-;; Copyright (C) 1986, 1988, 1994, 1999, 2000, 2002, 2003,
-;;   2004, 2005 Free Software Foundation, Inc.
+;; Copyright (C) 1986, 1988, 1994, 1999, 2000, 2001, 2002, 2003,
+;;   2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
 
 ;; Maintainer: FSF
 ;; Keywords: internal
 
 ;; 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
-;; 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
@@ -19,9 +19,7 @@
 ;; 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:
 
@@ -68,7 +66,7 @@ comparison."
         (suffixes
          ;; Subdirectories in each directory tree that may contain info
          ;; directories.
-         '("" "share/" "gnu/" "gnu/lib/" "gnu/lib/emacs/"
+         '("share/" "" "gnu/" "gnu/lib/" "gnu/lib/emacs/"
            "emacs/" "lib/" "lib/emacs/"))
         (standard-info-dirs
          (apply #'nconc
@@ -81,10 +79,10 @@ comparison."
                                 dirs
                               (prune-directory-list dirs config))))
                         prefixes))))
-    ;; If $(prefix)/info is not one of the standard info directories,
-    ;; they are probably installing an experimental version of Emacs,
-    ;; so make sure that experimental version's Info files override
-    ;; the ones in standard directories.
+    ;; If $(prefix)/share/info is not one of the standard info
+    ;; directories, they are probably installing an experimental
+    ;; version of Emacs, so make sure that experimental version's Info
+    ;; files override the ones in standard directories.
     (if (member config-dir standard-info-dirs)
        (nconc standard-info-dirs config)
       (cons config-dir standard-info-dirs)))
@@ -153,22 +151,12 @@ The `ORGANIZATION' environment variable is used instead if defined.")
        ;; 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 unisoft-unix irix))
         "/usr/mail/")
        (t "/usr/spool/mail/"))
   "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
@@ -205,5 +193,5 @@ the terminal-initialization file to be loaded.")
     (convert-standard-filename "~/.abbrev_defs"))
   "*Default name of file to read abbrevs from.")
 
-;;; arch-tag: bae27ffb-9944-4c87-b569-30d4635a99e1
+;; arch-tag: bae27ffb-9944-4c87-b569-30d4635a99e1
 ;;; paths.el ends here