* simple.el (comment-indent-function): New variable, intended to

	replace comment-indent-hook.
	(comment-indent-hook): Make this default to nil now.
	(indent-for-comment): If comment-indent-hook is non-nil, call it
	for backward compatibility; otherwise, call
	comment-indent-function.
	* bytecomp.el: Declare comment-indent-hook an obsolete variable.

lisp/emacs-lisp/bytecomp.el

@@ -2994,6 +2994,7 @@ For example, invoke \"emacs -batch -f batch-byte-compile $emacs/ ~/*.el\""
 (make-obsolete-variable 'unread-command-event
   "use unread-command-events; this is now a list of events.")
 (make-obsolete-variable 'suspend-hook 'suspend-hooks)
+(make-obsolete-variable 'comment-indent-hook 'comment-indent-function)
 
 (provide 'byte-compile)
 

lisp/simple.el

@@ -1491,7 +1491,12 @@ at the place matched by the close of the first pair.")
   "*String to insert to end a new comment.
 Should be an empty string if comments are terminated by end-of-line.")
 
-(defconst comment-indent-hook
+(defconst comment-indent-hook nil
+  "Obsolete variable for function to compute desired indentation for a comment.
+This function is called with no args with point at the beginning of
+the comment's starting delimiter.")
+
+(defconst comment-indent-function
   '(lambda () comment-column)
   "Function to compute desired indentation for a comment.
 This function is called with no args with point at the beginning of
@@ -1521,7 +1526,9 @@ the comment's starting delimiter.")
       (setq begpos (point))
       ;; Compute desired indent.
       (if (= (current-column)
-	     (setq indent (funcall comment-indent-hook)))
+	     (if comment-indent-hook
+		 (funcall comment-indent-hook)
+	       (funcall comment-indent-function)))
 	  (goto-char begpos)
 	;; If that's different from current, change it.
 	(skip-chars-backward " \t")