summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChong Yidong <cyd@stupidchicken.com>2009-12-06 15:34:59 +0000
committerChong Yidong <cyd@stupidchicken.com>2009-12-06 15:34:59 +0000
commitb857059c0aaae85bff9c897b97dcba532e93e40a (patch)
tree332dda1547c59561c9379a620fad24d8abbc1ead
parentc2dae51b689c88f094e49963565f39a171b2a46a (diff)
downloademacs-b857059c0aaae85bff9c897b97dcba532e93e40a.tar.gz
* progmodes/js.el (js--js-not): Add null to the list of values.
-rw-r--r--lisp/ChangeLog4
-rw-r--r--lisp/progmodes/js.el2
2 files changed, 5 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index ec7a3e25235..aaa1a4b861e 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2009-12-06 Daniel Colascione <dan.colascione@gmail.com>
+
+ * progmodes/js.el (js--js-not): Add null to the list of values.
+
2009-12-06 Chong Yidong <cyd@stupidchicken.com>
* ansi-color.el (ansi-color-for-comint-mode): Add :version
diff --git a/lisp/progmodes/js.el b/lisp/progmodes/js.el
index 96b49499f4f..cba315ac2d4 100644
--- a/lisp/progmodes/js.el
+++ b/lisp/progmodes/js.el
@@ -2603,7 +2603,7 @@ with `js--js-encode-value'."
js-js-timeout))))
(defsubst js--js-not (value)
- (memq value '(nil false undefined)))
+ (memq value '(nil null false undefined)))
(defsubst js--js-true (value)
(not (js--js-not value)))