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

[Miles Bader]

Index: emacs/lisp/newcomment.el
diff -c emacs/lisp/newcomment.el:1.48.2.10 emacs/lisp/newcomment.el:1.48.2.11
*** emacs/lisp/newcomment.el:1.48.2.10  Thu Sep 16 00:12:21 2004
--- emacs/lisp/newcomment.el    Wed Oct  6 05:23:54 2004
***************
*** 215,222 ****
  
  ;;;###autoload
  (defcustom comment-multi-line nil
!   "*Non-nil means \\[comment-indent-new-line] continues comments, with no new 
terminator or starter.
! This is obsolete because you might as well use \\[newline-and-indent]."
    :type 'boolean)
  
  (defcustom comment-empty-lines nil
--- 215,227 ----
  
  ;;;###autoload
  (defcustom comment-multi-line nil
!   "*Non-nil means `comment-indent-new-line' continues comments.
! That is, it inserts no new terminator or starter.
! This affects `auto-fill-mode', which is the main reason to
! customize this variable.
! 
! It also affects \\[indent-new-comment-line].  However, if you want this
! behavior for explicit filling, you might as well use \\[newline-and-indent]."
    :type 'boolean)
  
  (defcustom comment-empty-lines nil
***************
*** 418,424 ****
  (defun comment-beginning ()
    "Find the beginning of the enclosing comment.
  Returns nil if not inside a comment, else moves point and returns
! the same as `comment-search-forward'."
    ;; HACK ATTACK!
    ;; We should really test `in-string-p' but that can be expensive.
    (unless (eq (get-text-property (point) 'face) 'font-lock-string-face)
--- 423,429 ----
  (defun comment-beginning ()
    "Find the beginning of the enclosing comment.
  Returns nil if not inside a comment, else moves point and returns
! the same as `comment-search-backward'."
    ;; HACK ATTACK!
    ;; We should really test `in-string-p' but that can be expensive.
    (unless (eq (get-text-property (point) 'face) 'font-lock-string-face)
***************
*** 430,436 ****
              (and
               ;; For modes where comment-start and comment-end are the same,
               ;; the search above may have found a `ce' rather than a `cs'.
!              (or (not (looking-at comment-end-skip))
                   ;; Maybe font-lock knows that it's a `cs'?
                   (eq (get-text-property (match-end 0) 'face)
                       'font-lock-comment-face)
--- 435,441 ----
              (and
               ;; For modes where comment-start and comment-end are the same,
               ;; the search above may have found a `ce' rather than a `cs'.
!              (or (if comment-end-skip (not (looking-at comment-end-skip)))
                   ;; Maybe font-lock knows that it's a `cs'?
                   (eq (get-text-property (match-end 0) 'face)
                       'font-lock-comment-face)