(dired-mode-map): Fix menu text of image-dired-display-thumbs.

[gnu-emacs] / lisp / paths.el

diff --git a/lisp/paths.el b/lisp/paths.el
index ea6fdb0abe80acaa15248d758557b1fcdfedcf50..15705fc8cae6b48646da3e3d7c2c4ec7a8dec37f 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, 2001, 2002, 2003,
-;;   2004, 2005, 2006, 2007, 2008 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 3, 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:
 
@@ -139,21 +137,15 @@ The `ORGANIZATION' environment variable is used instead if defined.")
   :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")
+  (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/")
-       ((memq system-type '(hpux usg-unix-v unisoft-unix irix))
+       ((memq system-type '(hpux usg-unix-v irix))
         "/usr/mail/")
        (t "/usr/spool/mail/"))
   "Name of directory used by system mailer for delivering new mail.