6 files changed, 29 insertions, 2 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index ef21f200186..838ee2dd93a 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,11 @@
+2009-10-31  Glenn Morris  <rgm@gnu.org>
+
+        * cedet/srecode/template.el, cedet/semantic/wisent/javascript.el:
+        * cedet/semantic/wisent/java-tags.el, cedet/semantic/texi.el:
+        * cedet/semantic/html.el:
+        Suppress harmless warnings about setting up semantic-imenu (not
+        part of Emacs) variables.
+
 2009-10-30  Stefan Monnier  <monnier@iro.umontreal.ca>
 
         * vc-bzr.el (vc-bzr-revision-keywords): New var.
diff --git a/lisp/cedet/semantic/html.el b/lisp/cedet/semantic/html.el
index 3e264d2d857..90c9824d5ab 100644
--- a/lisp/cedet/semantic/html.el
+++ b/lisp/cedet/semantic/html.el
@@ -222,6 +222,11 @@ tag with greater section value than LEVEL is found."
   "The children TAG expands to."
   (semantic-html-components tag))
 
+;; In semantic-imenu.el, not part of Emacs.
+(defvar semantic-imenu-expandable-tag-classes)
+(defvar semantic-imenu-bucketize-file)
+(defvar semantic-imenu-bucketize-type-members)
+
 ;;;###autoload
 (defun semantic-default-html-setup ()
   "Set up a buffer for parsing of HTML files."
diff --git a/lisp/cedet/semantic/texi.el b/lisp/cedet/semantic/texi.el
index 50b2acd3b25..ae85105bbe2 100644
--- a/lisp/cedet/semantic/texi.el
+++ b/lisp/cedet/semantic/texi.el
@@ -447,6 +447,11 @@ that start with that symbol."
 
 ;;; Parser Setup
 ;;
+;; In semantic-imenu.el, not part of Emacs.
+(defvar semantic-imenu-expandable-tag-classes)
+(defvar semantic-imenu-bucketize-file)
+(defvar semantic-imenu-bucketize-type-members)
+
 (defun semantic-default-texi-setup ()
   "Set up a buffer for parsing of Texinfo files."
   ;; This will use our parser.
diff --git a/lisp/cedet/semantic/wisent/java-tags.el b/lisp/cedet/semantic/wisent/java-tags.el
index 1d8f38fc784..8d0ef3d6fa9 100644
--- a/lisp/cedet/semantic/wisent/java-tags.el
+++ b/lisp/cedet/semantic/wisent/java-tags.el
@@ -1,7 +1,7 @@
 ;;; semantic/wisent/java-tags.el --- Java LALR parser for Emacs
 
-;;; Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2009
-;;; Free Software Foundation, Inc.
+;; Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2009
+;;   Free Software Foundation, Inc.
 
 ;; Author: David Ponce <david@dponce.com>
 ;; Maintainer: David Ponce <david@dponce.com>
@@ -78,6 +78,9 @@ This function override `get-local-variables'."
 ;;;; Semantic integration of the Java LALR parser
 ;;;;
 
+;; In semantic-imenu.el, not part of Emacs.
+(defvar semantic-imenu-summary-function)
+
 ;;;###autoload
 (defun wisent-java-default-setup ()
   "Hook run to setup Semantic in `java-mode'.
diff --git a/lisp/cedet/semantic/wisent/javascript.el b/lisp/cedet/semantic/wisent/javascript.el
index 8ea52d86194..c76fdffab1a 100644
--- a/lisp/cedet/semantic/wisent/javascript.el
+++ b/lisp/cedet/semantic/wisent/javascript.el
@@ -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."
diff --git a/lisp/cedet/srecode/template.el b/lisp/cedet/srecode/template.el
index b4f372c1370..8cb63e7c8ec 100644
--- a/lisp/cedet/srecode/template.el
+++ b/lisp/cedet/srecode/template.el
@@ -39,6 +39,9 @@
       ans)
     ))
 
+;; In semantic-imenu.el, not part of Emacs.
+(defvar semantic-imenu-summary-function)
+
 ;;;###autoload
 (defun srecode-template-setup-parser ()
   "Setup buffer for parse."