diff lisp/w3/css.el @ 165:5a88923fcbfe r20-3b9

Import from CVS: tag r20-3b9
author cvs
date Mon, 13 Aug 2007 09:44:42 +0200
parents b980b6286996
children
line wrap: on
line diff
--- a/lisp/w3/css.el	Mon Aug 13 09:43:39 2007 +0200
+++ b/lisp/w3/css.el	Mon Aug 13 09:44:42 2007 +0200
@@ -1,7 +1,7 @@
 ;;; css.el -- Cascading Style Sheet parser
 ;; Author: wmperry
-;; Created: 1997/04/21 14:00:12
-;; Version: 1.38
+;; Created: 1997/05/11 00:54:23
+;; Version: 1.39
 ;; Keywords: 
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
@@ -902,7 +902,7 @@
 	      (looking-at "--+>"))	; end
 	  (goto-char (match-end 0)))
 	 ;; C++ style comments
-	 ((looking-at "//")
+	 ((looking-at "[ \t]*//")
 	  (end-of-line))
 	 ;; Pre-Processor directives
 	 ((looking-at "[ \t\r]*@\\([^ \t\r\n]\\)")
@@ -915,7 +915,7 @@
 	    (skip-chars-forward " \t\r")
 	    (setq save-pos (point))
 	    (cond
-	     ((looking-at ".*\\({\\)")
+	     ((looking-at "[^{]*\\({\\)")
 	      (goto-char (match-beginning 1))
 	      (forward-sexp 1)
 	      (setq data (buffer-substring save-pos (1- (point)))))
@@ -954,7 +954,6 @@
 	  (condition-case ()
 	      (forward-sexp 1)
 	    (error (goto-char (point-max))))
-	  (end-of-line)
 	  (skip-chars-backward "\r}")
 	  (subst-char-in-region save-pos (point) ?\n ? )
 	  (subst-char-in-region save-pos (point) ?\r ? )