Changeset 2294

Timestamp:

11/29/07 14:18:49 (1 year ago)

Author:

hhubner

Message:

Updated version from http://joost.zeekat.nl/wp-content/javascript.el

Files:

• branches/trunk-reorg/thirdparty/emacs/javascript.el (modified) (4 diffs)

branches/trunk-reorg/thirdparty/emacs/javascript.el

@@ -1 +1 @@
-;;; javascript.el --- Major mode for editing JavaScript source text
+
+;; This version contains a few font-lock fixes for quoted strings
+;; and regular expressions by Joost Diepenmaat <joost@zeekat.nl>
+;; Joost's version - 2007-11-29
+
+;; Currently known issues:
+;;
+;; /* .. */ style comments inside quoted strings are shown as comments
+;; instead of quoted strings. Fixing this may get complicated.
-
-;; Copyright (C) 2006 Karl Landström
@@ -8 +17 @@
-;; Date: 2006-12-26
-;; Keywords: languages, oop
-
-;; This version contains a few font-lock fixes for quoted strings
-;; and regular expressions by Joost Diepenmaat <joost@zeekat.nl>
-
-;; This file is free software; you can redistribute it and/or modify
@@ -118 +124 @@
-    (modify-syntax-entry ?\" "." table)
-
+    ;; partially disable comment detection. Our manual string detection 
+    ;; won't work if there are automatically detected comments inside the 
+    ;; string.
+    ;;
+    ;; note that we keep auto-detection of /* .. */ style comments since
+    ;; they are multi-line and can't easily be detected otherwise.
+    (modify-syntax-entry ?/ ". 14" table)
+
-    ;; The syntax class of underscore should really be `symbol' ("_")
-    ;; but that makes matching of tokens much more complex as e.g.
@@ -298 +312 @@
-   ;; detect "autoquoted" object properties... clases with "switch { ...  default: }"
-   ;; may not be worth the trouble
-
-
+
+
+
+
-  "Level one font lock.")
-