Merged from miles@gnu.org--gnu-2005 (patch 152-156, 642-654)

Patches applied:

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-642
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-643
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-644
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-645
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-646
   Merge from gnus--rel--5.10

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-647
   lisp/gnus/ChangeLog: Remove duplicate entry

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-648
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-649
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-650
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-651
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-652
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-653
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-654
   Update from CVS

 * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-152
   Update from CVS: lisp/mml.el (mml-preview): Doc fix.

 * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-153
   Update from CVS

 * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-154
   Update from CVS

 * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-155
   Update from CVS

 * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-156
   Update from CVS

git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-440

4 files changed, 13 insertions, 15 deletions

diff --git a/lisp/emacs-lisp/autoload.el b/lisp/emacs-lisp/autoload.el
index b14a556e02d..ff795e6de77 100644
--- a/lisp/emacs-lisp/autoload.el
+++ b/lisp/emacs-lisp/autoload.el
@@ -568,6 +568,9 @@ directory or directories specified."
 
       (save-buffer))))
 
+(define-obsolete-function-alias 'update-autoloads-from-directories
+    'update-directory-autoloads "22.1")
+
 ;;;###autoload
 (defun batch-update-autoloads ()
   "Update loaddefs.el autoloads in batch mode.
diff --git a/lisp/emacs-lisp/byte-opt.el b/lisp/emacs-lisp/byte-opt.el
index 8711a05e2d9..b46366a94b9 100644
--- a/lisp/emacs-lisp/byte-opt.el
+++ b/lisp/emacs-lisp/byte-opt.el
@@ -545,7 +545,7 @@
 				(eq (car-safe (nth 2 last)) 'cdr)
 				(eq (cadr (nth 2 last)) var))))
 		    (progn
-		      (byte-compile-warn "`%s' called for effect"
+		      (byte-compile-warn "value returned by `%s' is not used"
 					 (prin1-to-string (car form)))
 		      nil)))
 	   (byte-compile-log "  %s called for effect; deleted" fn)
diff --git a/lisp/emacs-lisp/derived.el b/lisp/emacs-lisp/derived.el
index 8e1f79f95ee..e595ff92a39 100644
--- a/lisp/emacs-lisp/derived.el
+++ b/lisp/emacs-lisp/derived.el
@@ -194,7 +194,12 @@ See Info node `(elisp)Derived Modes' for more details."
 		     parent child docstring syntax abbrev))
 
     `(progn
-       (defvar ,hook nil ,(format "Hook run when entering %s mode." name))
+       (unless (get  ',hook 'variable-documentation)
+	 (put ',hook 'variable-documentation
+	      ,(format "Hook run when entering %s mode.
+No problems result if this variable is not bound.
+`add-hook' automatically binds it.  (This is true for all hook variables.)"
+		       name)))
        (defvar ,map (make-sparse-keymap))
        ,(if declare-syntax
 	    `(defvar ,syntax (make-syntax-table)))
diff --git a/lisp/emacs-lisp/lisp-mode.el b/lisp/emacs-lisp/lisp-mode.el
index b9a73218322..6dd5ffa217f 100644
--- a/lisp/emacs-lisp/lisp-mode.el
+++ b/lisp/emacs-lisp/lisp-mode.el
@@ -233,8 +233,6 @@
   (setq comment-column 40)
   ;; Don't get confused by `;' in doc strings when paragraph-filling.
   (set (make-local-variable 'comment-use-global-state) t)
-  (make-local-variable 'comment-indent-function)
-  (setq comment-indent-function 'lisp-comment-indent)
   (make-local-variable 'imenu-generic-expression)
   (setq imenu-generic-expression lisp-imenu-generic-expression)
   (make-local-variable 'multibyte-syntax-as-symbol)
@@ -746,17 +744,9 @@ which see."
 	     (unless (eq old-value new-value)
 	       (setq debug-on-error new-value))
 	     value)))))
-
-;; Used for comment-indent-function in Lisp modes.
-(defun lisp-comment-indent ()
-  (if (looking-at "\\s<\\s<\\s<")
-      (current-column)
-    (if (looking-at "\\s<\\s<")
-	(let ((tem (or (calculate-lisp-indent) (current-column))))
-	  (if (listp tem) (car tem) tem))
-      (skip-chars-backward " \t")
-      (max (if (bolp) 0 (1+ (current-column)))
-	   comment-column))))
+
+;; May still be used by some external Lisp-mode variant.
+(define-obsolete-function-alias 'lisp-comment-indent 'comment-indent-default)
 
 ;; This function just forces a more costly detection of comments (using
 ;; parse-partial-sexp from beginning-of-defun).  I.e. It avoids the problem of