diff --git a/ChangeLog b/ChangeLog
index 204bd99ce..7846a88d4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,8 @@
-2002-08-17  Pavel Roskin  <proski@gnu.org>
+2002-09-17  Vlad Romanenko  <VladRomanenko@ukr.net>
+
+	* syntax/js.syntax: Advanced number highliting.
+
+2002-09-17  Pavel Roskin  <proski@gnu.org>
 
 	* syntax/c.syntax: Highlight "?" by the same color as ":".
 	* syntax/java.syntax: Likewise.
@@ -17,7 +21,7 @@
 	be explicitly enabled by `--with-glib2'.
 	From Ali Akcaagac <ali.akcaagac@stud.fh-wilhelmshaven.de>
 
-2002-08-16  Pavel Roskin  <proski@gnu.org>
+2002-09-16  Pavel Roskin  <proski@gnu.org>
 
 	* syntax/js.syntax: New file.
 	* syntax/Syntax: Add js.syntax.
diff --git a/syntax/js.syntax b/syntax/js.syntax
index 0fb99ef52..c3b32eda6 100644
--- a/syntax/js.syntax
+++ b/syntax/js.syntax
@@ -9,8 +9,12 @@
 # Highlight JS regexpressions /../
 # More built-in functions
 #
+# 2002-09-17  Vlad Romanenko <VladRomanenko@ukr.net>
+#	* More C and Java consistency by Pavel Roskin <proski@gnu.org>.
+#	* Advanced number highliting.
+#
 # 2002-09-16  Vlad Romanenko <VladRomanenko@ukr.net>
-#	* Initial public release
+#	* Initial public release.
 #
 
 context default
@@ -83,14 +87,22 @@ context default
 
 	#=========================
 	# Comments
-	keyword /\*	brown/22
-	keyword \*/	brown/22
-	keyword //	brown/22
+	keyword /\*			brown/22
+	keyword \*/			brown/22
+	keyword //			brown/22
 
 	#=========================
 	# Numbers
-	keyword whole -\{012345679\}\[012345679\]	brightgreen/16
-	keyword whole \{012345679\}\[012345679\]	brightgreen/16
+	wholechars abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789_.
+
+	keyword whole 0\{xX\}\{0123456789abcdefABCDEF\}\[0123456789abcdefABCDEF\]	brightgreen/16
+	keyword whole \{0123456789\}\[0123456789\]	brightgreen/16
+	keyword whole \[0123456789\]\.\{0123456789\}\[0123456789\]	brightgreen/16
+	keyword whole \{0123456789\}\[0123456789\]\.\[0123456789\]	brightgreen/16
+	keyword whole \{0123456789\}\[0123456789\]\{eE\}\{0123456789\}\[0123456789\]	brightgreen/16
+	keyword whole \{0123456789\}\[0123456789\]\{eE\}\{\-\+\}\{0123456789\}\[0123456789\]	brightgreen/16
+	keyword whole \{0123456789\}\[0123456789\]\.\{0123456789\}\[0123456789\]\{eE\}\{0123456789\}\[0123456789\]	brightgreen/16
+	keyword whole \{0123456789\}\[0123456789\]\.\{0123456789\}\[0123456789\]\{eE\}\{\-\+\}\{0123456789\}\[0123456789\]	brightgreen/16
 
 	#=========================
 	# Special symbols
@@ -110,16 +122,13 @@ context default
 	keyword <	yellow/24
 
 	#=========================
-	# Parentheses
+	# Separators
 	keyword {	brightcyan/14
 	keyword }	brightcyan/14
 	keyword (	brightcyan/14
 	keyword )	brightcyan/14
 	keyword [	brightcyan/14
 	keyword ]	brightcyan/14
-
-	#=========================
-	# Separators
 	keyword ,	brightcyan/14
 	keyword ?	brightcyan/14
 	keyword :	brightcyan/14
@@ -129,22 +138,30 @@ context default
 #=============================
 # Comments
 
-context exclusive /\* \*/	brown/22
+context exclusive /\* \*/ brown/22
 	spellcheck
+	keyword whole BUG	brightred/18
+	keyword whole FixMe	brightred/18
+	keyword whole FIXME	brightred/18
+	keyword whole Note	brightred/18
+	keyword whole NOTE	brightred/18
+	keyword whole ToDo	brightred/18
 	keyword whole TODO	brightred/18
-	keyword !!!		brightred/18
-	keyword !!		brightred/18
-	keyword ???		brightred/18
-	keyword ??		brightred/18
+	keyword !!\[!\]		brightred/18
+	keyword ??\[?\]		brightred/18
 
 
-context exclusive // \n		brown/22
+context exclusive // \n brown/22
 	spellcheck
+	keyword whole BUG	brightred/18
+	keyword whole FixMe	brightred/18
+	keyword whole FIXME	brightred/18
+	keyword whole Note	brightred/18
+	keyword whole NOTE	brightred/18
+	keyword whole ToDo	brightred/18
 	keyword whole TODO	brightred/18
-	keyword !!!		brightred/18
-	keyword !!		brightred/18
-	keyword ???		brightred/18
-	keyword ??		brightred/18
+	keyword !!\[!\]		brightred/18
+	keyword ??\[?\]		brightred/18
 
 
 #=============================
@@ -152,20 +169,14 @@ context exclusive // \n		brown/22
 
 context " " green/6
 	spellcheck
-	keyword \\"					brightgreen/16
-	keyword \\'					brightgreen/16
-	keyword \\\\					brightgreen/16
-	keyword \\\{abtnvfr\}				brightgreen/16
-	keyword \\\{0123\}\{01234567\}\{01234567\}	brightgreen/16
+	keyword \\\{\\'"abtnvfr\}	brightgreen/16
+	keyword \\\{0123\}\{01234567\}\{01234567\} brightgreen/16
 
-	keyword '					brightgreen/16
+	keyword '	brightgreen/16
 
 context ' ' green/6
 	spellcheck
-	keyword \\"					brightgreen/16
-	keyword \\'					brightgreen/16
-	keyword \\\\					brightgreen/16
-	keyword \\\{abtnvfr\}				brightgreen/16
-	keyword \\\{0123\}\{01234567\}\{01234567\}	brightgreen/16
+	keyword \\\{\\'"abtnvfr\}	brightgreen/16
+	keyword \\\{0123\}\{01234567\}\{01234567\} brightgreen/16
 
-	keyword "					brightgreen/16
+	keyword "	brightgreen/16