[Emacs-diffs] Changes to emacs/lisp/emacs-lisp/lisp-mode.el

[Stefan Monnier]

Index: emacs/lisp/emacs-lisp/lisp-mode.el
diff -c emacs/lisp/emacs-lisp/lisp-mode.el:1.188 
emacs/lisp/emacs-lisp/lisp-mode.el:1.189
*** emacs/lisp/emacs-lisp/lisp-mode.el:1.188    Mon Oct 24 16:47:53 2005
--- emacs/lisp/emacs-lisp/lisp-mode.el  Tue Nov  8 01:46:36 2005
***************
*** 233,240 ****
    (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)
--- 233,238 ----
***************
*** 746,762 ****
             (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))))
  
  ;; 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
--- 744,752 ----
             (unless (eq old-value new-value)
               (setq debug-on-error new-value))
             value)))))
! 
! ;; 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