Mercurial > emacs

--- a/lisp/ChangeLog	Mon Nov 07 23:09:59 2005 +0000
+++ b/lisp/ChangeLog	Tue Nov 08 01:46:37 2005 +0000
@@ -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
--- a/lisp/emacs-lisp/lisp-mode.el	Mon Nov 07 23:09:59 2005 +0000
+++ b/lisp/emacs-lisp/lisp-mode.el	Tue Nov 08 01:46:37 2005 +0000
@@ -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 @@
 	     (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