summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChong Yidong <cyd@stupidchicken.com>2010-02-24 10:12:17 -0500
committerChong Yidong <cyd@stupidchicken.com>2010-02-24 10:12:17 -0500
commit6583ba0ea52f2def6484d562e4d3de88a059d0a3 (patch)
tree078bfdc3b06710375a18bc05ff72d034816dcbd4
parentdaf4b83bd5b70a660ac4899876f7e69a607e48b5 (diff)
downloademacs-6583ba0ea52f2def6484d562e4d3de88a059d0a3.tar.gz
* javascript.el (wisent-javascript-jv-expand-tag): Avoid c(ad)ddr
and use c(ad)r of cddr (Bug#5640).
-rw-r--r--lisp/ChangeLog5
-rw-r--r--lisp/cedet/semantic/wisent/javascript.el4
2 files changed, 7 insertions, 2 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 541c723de2b..3e8e19f7cc4 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2010-02-24 Eduard Wiebe <usenet@pusto.de>
+
+ * javascript.el (wisent-javascript-jv-expand-tag): Avoid c(ad)ddr
+ and use c(ad)r of cddr (Bug#5640).
+
2010-02-22 Michael Albinus <michael.albinus@gmx.de>
* net/tramp.el (tramp-do-copy-or-rename-file-out-of-band): Protect
diff --git a/lisp/cedet/semantic/wisent/javascript.el b/lisp/cedet/semantic/wisent/javascript.el
index 34afb75d62c..df3bbfecaa5 100644
--- a/lisp/cedet/semantic/wisent/javascript.el
+++ b/lisp/cedet/semantic/wisent/javascript.el
@@ -48,8 +48,8 @@ to this variable NAME."
elts (cdr elts)
clone (semantic-tag-clone tag (car elt))
value (car (cdr elt))
- start (if elts (caddr elt) (semantic-tag-start tag))
- end (if xpand (cdddr elt) (semantic-tag-end tag))
+ start (if elts (car (cddr elt)) (semantic-tag-start tag))
+ end (if xpand (cdr (cddr elt)) (semantic-tag-end tag))
xpand (cons clone xpand))
;; Set the definition of the cloned tag
(semantic-tag-put-attribute clone :default-value value)