X-Git-Url: https://git.hcoop.net/bpt/emacs.git/blobdiff_plain/b82525f29a46897b1583919818d174d6f778e2bd..4f306b0fa712b624f079c41d948ed8f51ab27607:/lisp/cedet/semantic/wisent/javascript.el

diff --git a/lisp/cedet/semantic/wisent/javascript.el b/lisp/cedet/semantic/wisent/javascript.el
index 892f76be4f..16b729f392 100644
--- a/lisp/cedet/semantic/wisent/javascript.el
+++ b/lisp/cedet/semantic/wisent/javascript.el
@@ -1,6 +1,6 @@
 ;;; semantic/wisent/javascript.el --- javascript parser support
 
-;;; Copyright (C) 2005 Free Software Foundation, Inc.
+;; Copyright (C) 2005, 2009-2011  Free Software Foundation, Inc.
 
 ;; Author: Eric Ludlam <zappo@gnu.org>
 ;; Keywords: syntax
@@ -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)
@@ -63,7 +63,7 @@ to this variable NAME."
 ;; These methods override aspects of how semantic-tools can access
 ;; the tags created by the javascript parser.
 ;; Local context
-(define-mode-overload-implementation semantic-get-local-variables
+(define-mode-local-override semantic-get-local-variables
   javascript-mode ()
   "Get local values from a specific context.
 This function overrides `get-local-variables'."
@@ -75,6 +75,9 @@ This function overrides `get-local-variables'."
 ;;
 ;; This sets up the javascript parser
 
+;; In semantic-imenu.el, not part of Emacs.
+(defvar semantic-imenu-summary-function)
+
 ;;;###autoload
 (defun wisent-javascript-setup-parser ()
   "Setup buffer for parse."
@@ -96,7 +99,6 @@ This function overrides `get-local-variables'."
 
 ;; Local variables:
 ;; generated-autoload-file: "../loaddefs.el"
-;; generated-autoload-feature: semantic/loaddefs
 ;; generated-autoload-load-name: "semantic/wisent/javascript"
 ;; End: