(lisp-mode-variables): Don't set comment-indent-function.

(lisp-comment-indent): Replace by an alias for comment-indent-default.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index dabac81308771e3e01f4b90c1e0f85f77c62dde5..c1edb5d26deb67a7927a515a437e605a6d5f7dc6 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,9 @@
 2005-11-07  Stefan Monnier  <monnier@iro.umontreal.ca>
 
+       * emacs-lisp/lisp-mode.el (lisp-mode-variables): Don't set
+       comment-indent-function.
+       (lisp-comment-indent): Replace by an alias for comment-indent-default.
+
        * reveal.el (reveal-post-command): Rework the handling of
        reveal-open-spots, so as to be more reliable.  There were several
        tricky corner cases where an open spot might be lost, or where

diff --git a/lisp/emacs-lisp/lisp-mode.el b/lisp/emacs-lisp/lisp-mode.el
index b9a732183221f84bcd8c21e62da8103446790cdc..6dd5ffa217f969f82825eb658fad45ec5b692fad 100644 (file)
--- 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)))))
-\f
-;; 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