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

[Miles Bader]

Index: emacs/lisp/newcomment.el
diff -c emacs/lisp/newcomment.el:1.67.2.5 emacs/lisp/newcomment.el:1.67.2.6
*** emacs/lisp/newcomment.el:1.67.2.5   Thu Sep 30 01:20:38 2004
--- emacs/lisp/newcomment.el    Mon Oct  4 01:04:16 2004
***************
*** 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-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)
***************
*** 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 (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)