aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChong Yidong2010-02-24 10:12:17 -0500
committerChong Yidong2010-02-24 10:12:17 -0500
commit6583ba0ea52f2def6484d562e4d3de88a059d0a3 (patch)
tree078bfdc3b06710375a18bc05ff72d034816dcbd4
parentdaf4b83bd5b70a660ac4899876f7e69a607e48b5 (diff)
downloademacs-6583ba0ea52f2def6484d562e4d3de88a059d0a3.tar.gz
emacs-6583ba0ea52f2def6484d562e4d3de88a059d0a3.zip
* 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 @@
12010-02-24 Eduard Wiebe <usenet@pusto.de>
2
3 * javascript.el (wisent-javascript-jv-expand-tag): Avoid c(ad)ddr
4 and use c(ad)r of cddr (Bug#5640).
5
12010-02-22 Michael Albinus <michael.albinus@gmx.de> 62010-02-22 Michael Albinus <michael.albinus@gmx.de>
2 7
3 * net/tramp.el (tramp-do-copy-or-rename-file-out-of-band): Protect 8 * 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."
48 elts (cdr elts) 48 elts (cdr elts)
49 clone (semantic-tag-clone tag (car elt)) 49 clone (semantic-tag-clone tag (car elt))
50 value (car (cdr elt)) 50 value (car (cdr elt))
51 start (if elts (caddr elt) (semantic-tag-start tag)) 51 start (if elts (car (cddr elt)) (semantic-tag-start tag))
52 end (if xpand (cdddr elt) (semantic-tag-end tag)) 52 end (if xpand (cdr (cddr elt)) (semantic-tag-end tag))
53 xpand (cons clone xpand)) 53 xpand (cons clone xpand))
54 ;; Set the definition of the cloned tag 54 ;; Set the definition of the cloned tag
55 (semantic-tag-put-attribute clone :default-value value) 55 (semantic-tag-put-attribute clone :default-value value)