upstream

10 files changed, 116 insertions, 86 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index cd57969f73f..8e9b88a6016 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,28 @@
+2012-05-24  Glenn Morris  <rgm@gnu.org>
+
+        * paths.el (term-file-prefix): Move to faces.el (the only user).
+        * faces.el (term-file-prefix): Move here, make it a defcustom.
+
+        * paths.el (news-directory, news-path, news-inews-program):
+        Move to gnus/nnspool.el.
+
+        * paths.el (gnus-default-nntp-server): Remove (gnus.el defines it).
+
+        * paths.el (rmail-file-name, rmail-spool-directory): Move from here...
+        * mail/rmail.el (rmail-file-name, rmail-spool-directory): ... to here.
+        Make the latter a defcustom, with a delayed initialization.
+
+        * paths.el (gnus-nntp-service, gnus-local-organization): Remove.
+        These were deleted from Gnus itself late 2010.
+
+2012-05-22  Juanma Barranquero  <lekktu@gmail.com>
+
+        * progmodes/which-func.el (which-func-ff-hook):
+        Check against user-error, not error.
+
+        * emacs-lisp/edebug.el (top): Do not load or set up loading of
+        cl-specs.el, which no longer exists.
+
 2012-05-22  Glenn Morris  <rgm@gnu.org>
 
         * info.el (info-emacs-bug): New command.
@@ -58,7 +83,7 @@
 
         * calc/calc-lang.el (math-C-parse-bess, math-C-parse-fma):
         New functions.
-        (math-function-table):  Add support for more C functions.
+        (math-function-table): Add support for more C functions.
 
 2012-05-18  Agustín Martín Domingo  <agustin.martin@hispalinux.es>
 
diff --git a/lisp/emacs-lisp/edebug.el b/lisp/emacs-lisp/edebug.el
index f47feebe5d2..2c7e7cf6362 100644
--- a/lisp/emacs-lisp/edebug.el
+++ b/lisp/emacs-lisp/edebug.el
@@ -1938,7 +1938,6 @@ expressions; a `progn' form will be returned enclosing these forms."
 
 ;;;; Edebug Form Specs
 ;;; ==========================================================
-;;; See cl-specs.el for common lisp specs.
 
 ;;;;* Spec for def-edebug-spec
 ;;; Out of date.
@@ -4437,13 +4436,6 @@ With prefix argument, make it a temporary breakpoint."
 
 ;;; Autoloading of Edebug accessories
 
-(if (featurep 'cl)
-    (add-hook 'edebug-setup-hook
-              (function (lambda () (require 'cl-specs))))
-  ;; The following causes cl-specs to be loaded if you load cl.el.
-  (add-hook 'cl-load-hook
-            (function (lambda () (require 'cl-specs)))))
-
 ;; edebug-cl-read and cl-read are available from liberte@cs.uiuc.edu
 (if (featurep 'cl-read)
     (add-hook 'edebug-setup-hook
diff --git a/lisp/faces.el b/lisp/faces.el
index b3b0fa9b7d2..d96f3af0ac0 100644
--- a/lisp/faces.el
+++ b/lisp/faces.el
@@ -28,6 +28,16 @@
 (eval-when-compile
   (require 'cl))
 
+(defcustom term-file-prefix (purecopy "term/")
+  "If non-nil, Emacs startup performs terminal-specific initialization.
+It does this by: (load (concat term-file-prefix (getenv \"TERM\")))
+
+You may set this variable to nil in your init file if you do not wish
+the terminal-initialization file to be loaded."
+  :type '(choice (const :tag "No terminal-specific initialization" nil)
+                 (string :tag "Name of directory with term files"))
+  :group 'terminals)
+
 (declare-function xw-defined-colors "term/common-win" (&optional frame))
 
 (defvar help-xref-stack-item)
diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index 9000ccb9fef..e096b9b2b26 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,3 +1,12 @@
+2012-05-24  Glenn Morris  <rgm@gnu.org>
+
+        * nnspool.el (news-directory, news-path, news-inews-program):
+        Move here from paths.el.  Don't see a need for these to be autoloaded.
+
+        * gnus.el (gnus-default-nntp-server): Make it a defcustom.
+        Merge in doc from paths.el version.  Don't see any need for this to be
+        autoloaded, or for the warning about users not setting it.
+
 2012-05-04  Paul Eggert  <eggert@cs.ucla.edu>
 
         Fix minor Y10k bug.
@@ -22655,7 +22664,7 @@
 
 See ChangeLog.2 for earlier changes.
 
-  Copyright (C) 2004-2012  Free Software Foundation, Inc.
+  Copyright (C) 2004-2012 Free Software Foundation, Inc.
 
   This file is part of GNU Emacs.
 
diff --git a/lisp/gnus/gnus.el b/lisp/gnus/gnus.el
index 635bb6fc96f..bba56e31d9b 100644
--- a/lisp/gnus/gnus.el
+++ b/lisp/gnus/gnus.el
@@ -1271,15 +1271,18 @@ Set this variable in `.emacs' instead."
   :type '(choice (const :tag "current" nil)
                  directory))
 
-;; Site dependent variables.  These variables should be defined in
-;; paths.el.
+;; Site dependent variables.
 
-(defvar gnus-default-nntp-server nil
-  "Specify a default NNTP server.
-This variable should be defined in paths.el, and should never be set
-by the user.
-If you want to change servers, you should use `gnus-select-method'.
-See the documentation to that variable.")
+;; Should this be obsolete?
+(defcustom gnus-default-nntp-server nil
+  "The hostname of the default NNTP server.
+The empty string, or nil, means to use the local host.
+You may wish to set this on a site-wide basis.
+
+If you want to change servers, you should use `gnus-select-method'."
+  :group 'gnus-server
+  :type '(choice (const :tag "local host" nil)
+                 (string :tag "host name")))
 
 (defcustom gnus-nntpserver-file "/etc/nntpserver"
   "A file with only the name of the nntp server in it."
@@ -1326,6 +1329,8 @@ If you use this variable, you must set `gnus-nntp-server' to nil.
 
 There is a lot more to know about select methods and virtual servers -
 see the manual for details."
+  ;; Emacs has set-after since 22.1.
+  ;set-after '(gnus-default-nntp-server)
   :group 'gnus-server
   :group 'gnus-start
   :initialize 'custom-initialize-default
diff --git a/lisp/gnus/nnspool.el b/lisp/gnus/nnspool.el
index 2b024e20740..fd079d909eb 100644
--- a/lisp/gnus/nnspool.el
+++ b/lisp/gnus/nnspool.el
@@ -31,6 +31,25 @@
 (require 'nnoo)
 (eval-when-compile (require 'cl))
 
+;; Probably this entire thing should be obsolete.
+;; It's only used to init nnspool-spool-directory, so why not just
+;; set that variable's default directly?
+(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)
+
+;; Ditto re obsolescence.
+(defvar news-inews-program
+  (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"))
+  "Program to post news.")
+
 (nnoo-declare nnspool)
 
 (defvoo nnspool-inews-program news-inews-program
diff --git a/lisp/mail/rmail.el b/lisp/mail/rmail.el
index 14bf9d90a16..cd2a961638e 100644
--- a/lisp/mail/rmail.el
+++ b/lisp/mail/rmail.el
@@ -100,8 +100,6 @@ its character representation and its display representation.")
   "The current header display style choice, one of
 'normal (selected headers) or 'full (all headers).")
 
-;; rmail-spool-directory and rmail-file-name are defined in paths.el.
-
 (defgroup rmail nil
   "Mail reader for Emacs."
   :group 'mail)
@@ -143,6 +141,40 @@ its character representation and its display representation.")
   :prefix "rmail-edit-"
   :group 'rmail)
 
+;;;###autoload
+(defcustom rmail-file-name (purecopy "~/RMAIL")
+  "Name of user's primary mail file."
+  :type 'string
+  :group 'rmail
+  :version "21.1")
+
+;;;###autoload
+(put 'rmail-spool-directory 'standard-value
+     '((cond ((file-exists-p "/var/mail") "/var/mail/")
+             ((file-exists-p "/var/spool/mail") "/var/spool/mail/")
+             ((memq system-type '(hpux usg-unix-v irix)) "/usr/mail/")
+             (t "/usr/spool/mail/"))))
+
+;;;###autoload
+(defcustom rmail-spool-directory
+  (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/")
+        ((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.
+Its name should end with a slash."
+  :initialize 'custom-initialize-delay
+  :type 'directory
+  :group 'rmail)
+
+;;;###autoload(custom-initialize-delay 'rmail-spool-directory nil)
+
 (defcustom rmail-movemail-program nil
   "If non-nil, the file name of the `movemail' program."
   :group 'rmail-retrieve
diff --git a/lisp/paths.el b/lisp/paths.el
index 70b5ca5dbfb..f44a0e660fc 100644
--- a/lisp/paths.el
+++ b/lisp/paths.el
@@ -1,6 +1,6 @@
 ;;; paths.el --- define pathnames for use by various Emacs commands -*- no-byte-compile: t -*-
 
-;; Copyright (C) 1986, 1988, 1994, 1999-2012  Free Software Foundation, Inc.
+;; Copyright (C) 1986, 1988, 1994, 1999-2012 Free Software Foundation, Inc.
 
 ;; Maintainer: FSF
 ;; Keywords: internal
@@ -101,59 +101,6 @@ This variable `Info-default-directory-list' is used as the default
 for initializing `Info-directory-list' when Info is started, unless
 the environment variable INFOPATH is set.")
 
-(defvar news-directory
-  (purecopy (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
-  (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")
-        (t "inews")))
-  "Program to post news.")
-
-;; set this to your local 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.")
-
-(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)'.")
-
-(defvar gnus-local-organization nil "\
-*The name of your organization, as a string.
-The `ORGANIZATION' environment variable is used instead if defined.")
-
-(defcustom rmail-file-name (purecopy "~/RMAIL") "\
-Name of user's primary mail file."
-  :type 'string
-  :group 'rmail
-  :version "21.1")
-
-(defvar rmail-spool-directory
-  (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/")
-        ((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.
-Its name should end with a slash.")
-
 (defcustom remote-shell-program
   (purecopy
   (cond
@@ -180,9 +127,4 @@ Its name should end with a slash.")
   :group 'environment
   :type 'file)
 
-(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.")
-
 ;;; paths.el ends here
diff --git a/lisp/progmodes/which-func.el b/lisp/progmodes/which-func.el
index d57a3128a16..07cb43b64a2 100644
--- a/lisp/progmodes/which-func.el
+++ b/lisp/progmodes/which-func.el
@@ -209,7 +209,8 @@ It creates the Imenu index for the buffer, if necessary."
           (setq imenu--index-alist
                 (save-excursion (funcall imenu-create-index-function))))
     (error
-     (unless (equal err '(error "This buffer cannot use `imenu-default-create-index-function'"))
+     (unless (equal err
+                    '(user-error "This buffer cannot use `imenu-default-create-index-function'"))
        (message "which-func-ff-hook error: %S" err))
      (setq which-func-mode nil))))
 
diff --git a/lisp/version.el b/lisp/version.el
index d7fb05ea465..804727a07c2 100644
--- a/lisp/version.el
+++ b/lisp/version.el
@@ -1,4 +1,4 @@
-;;; version.el --- record version number of Emacs
+;;; version.el --- record version number of Emacs -*- no-byte-compile: t -*-
 
 ;; Copyright (C) 1985, 1992, 1994-1995, 1999-2012
 ;;   Free Software Foundation, Inc.
@@ -121,9 +121,4 @@ Optional argument DIR is a directory to use instead of `source-directory'."
 (purecopy (concat "\n$Id: " (subst-char-in-string ?\n ?\s (emacs-version))
                   " $\n"))
 
-;; Local Variables:
-;; version-control: never
-;; no-byte-compile: t
-;; End:
-
 ;;; version.el ends here