# HG changeset patch
# User Stefan Monnier <monnier@iro.umontreal.ca>
# Date 983565100 0
# Node ID e40c1ae4f04b163dd9b1f77f11585e0b4262552f
# Parent  9659356a47232f39ce12705e6b8fed68d4516b37
(comment-normalize-vars): Use [ \t] for the trailing
spaces in default comment-start-skip settings rather than \s-.

diff -r 9659356a4723 -r e40c1ae4f04b lisp/newcomment.el
--- a/lisp/newcomment.el	Fri Mar 02 18:40:01 2001 +0000
+++ b/lisp/newcomment.el	Fri Mar 02 20:31:40 2001 +0000
@@ -5,7 +5,7 @@
 ;; Author: code extracted from Emacs-20's simple.el
 ;; Maintainer: Stefan Monnier <monnier@cs.yale.edu>
 ;; Keywords: comment uncomment
-;; Revision: $Id: newcomment.el,v 1.29 2000/12/18 03:17:31 monnier Exp $
+;; Revision: $Id: newcomment.el,v 1.30 2001/02/22 01:47:40 monnier Exp $
 
 ;; This file is part of GNU Emacs.
 
@@ -233,7 +233,9 @@
       (set (make-local-variable 'comment-start-skip)
 	   (concat "\\(\\(^\\|[^\\\\\n]\\)\\(\\\\\\\\\\)*\\)\\(\\s<+\\|"
 		   (regexp-quote (comment-string-strip comment-start t t))
-		   "+\\)\\s-*")))
+		   ;; Let's not allow any \s- but only [ \t] since \n
+		   ;; might be both a comment-end marker and \s-.
+		   "+\\)[ \t]*")))
     (unless comment-end-skip
       (let ((ce (if (string= "" comment-end) "\n"
 		  (comment-string-strip comment-end t t))))
@@ -346,15 +348,18 @@
   "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'."
-  (let ((pt (point))
-	(cs (comment-search-backward nil t)))
-    (when cs
-      (if (save-excursion
-	    (goto-char cs)
-	    (if (comment-forward 1) (> (point) pt) (eobp)))
-	  cs
-	(goto-char pt)
-	nil))))
+  ;; 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)
+    (let ((pt (point))
+	  (cs (comment-search-backward nil t)))
+      (when cs
+	(if (save-excursion
+	      (goto-char cs)
+	      (if (comment-forward 1) (> (point) pt) (eobp)))
+	    cs
+	  (goto-char pt)
+	  nil)))))
 
 (defun comment-forward (&optional n)
   "Skip forward over N comments.