Merge from trunk.

6 files changed, 23 insertions, 6 deletions

diff --git a/lisp/cedet/ChangeLog b/lisp/cedet/ChangeLog
index f9a546ec894..361ccba10cc 100644
--- a/lisp/cedet/ChangeLog
+++ b/lisp/cedet/ChangeLog
@@ -1,3 +1,14 @@
+2012-02-09  Juanma Barranquero  <lekktu@gmail.com>
+
+        * ede/auto.el (ede-directory-safe-p, ede-add-project-to-global-list):
+        Add declarations.
+
+2012-01-29  David Engster  <deng@randomsample.de>
+
+        Fix require error when using srecode-insert (Bug#9967).
+        * srecode/insert.el: Require srecode/filters.
+        * srecode/filters.el: Drop two requires.
+
 2012-01-09  Eric Ludlam  <zappo@gnu.org>
 
         * ede.el (ede-project-directories): New option.
@@ -140,8 +151,8 @@
 
 2011-07-30  Chong Yidong  <cyd@stupidchicken.com>
 
-        * semantic/grammar.el (semantic-grammar-insert-defanalyzers): Fix
-        require.
+        * semantic/grammar.el (semantic-grammar-insert-defanalyzers):
+        Fix require.
 
 2011-07-04  Darren Hoo  <darren.hoo@gmail.com>  (tiny change)
 
diff --git a/lisp/cedet/ede/auto.el b/lisp/cedet/ede/auto.el
index b458cc246f0..a5ea8178858 100644
--- a/lisp/cedet/ede/auto.el
+++ b/lisp/cedet/ede/auto.el
@@ -31,6 +31,9 @@
 
 (require 'eieio)
 
+(declare-function ede-directory-safe-p "ede")
+(declare-function ede-add-project-to-global-list "ede")
+
 (defclass ede-project-autoload ()
   ((name :initarg :name
          :documentation "Name of this project type")
diff --git a/lisp/cedet/semantic/wisent/js-wy.el b/lisp/cedet/semantic/wisent/js-wy.el
index b8d3240aef1..05346b02c8d 100644
--- a/lisp/cedet/semantic/wisent/js-wy.el
+++ b/lisp/cedet/semantic/wisent/js-wy.el
@@ -1,7 +1,7 @@
 ;;; semantic/wisent/js-wy.el --- Generated parser support file
 
 ;; Copyright (C) 2005, 2009-2012  Free Software Foundation, Inc.
-;; Copyright (C) 1998-2011 Ecma International
+;; Copyright (C) 1998-2011 Ecma International.
 
 ;; This file is part of GNU Emacs.
 
diff --git a/lisp/cedet/semantic/wisent/python-wy.el b/lisp/cedet/semantic/wisent/python-wy.el
index cb0f37c8f16..e8229dcd9ea 100644
--- a/lisp/cedet/semantic/wisent/python-wy.el
+++ b/lisp/cedet/semantic/wisent/python-wy.el
@@ -1,7 +1,8 @@
 ;;; semantic/wisent/python-wy.el --- Generated parser support file
 
 ;; Copyright (C) 2002-2004, 2007, 2010-2012  Free Software Foundation, Inc.
-;; Copyright (C) 2001-2010 Python Software Foundation
+;; Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008,
+;; 2009, 2010 Python Software Foundation; All Rights Reserved
 
 ;; This file is part of GNU Emacs.
 
diff --git a/lisp/cedet/srecode/filters.el b/lisp/cedet/srecode/filters.el
index 67435f23e90..d4a7e542770 100644
--- a/lisp/cedet/srecode/filters.el
+++ b/lisp/cedet/srecode/filters.el
@@ -26,8 +26,9 @@
 ;;; Code:
 
 (require 'newcomment)
-(require 'srecode/table)
-(require 'srecode/insert)
+
+(declare-function srecode-dictionary-lookup-name "srecode/dictionary")
+(defvar srecode-inserter-variable-current-dictionary)
 
 (defun srecode-comment-prefix (str)
   "Prefix each line of STR with the comment prefix characters."
diff --git a/lisp/cedet/srecode/insert.el b/lisp/cedet/srecode/insert.el
index 40d3374c744..7d300614c08 100644
--- a/lisp/cedet/srecode/insert.el
+++ b/lisp/cedet/srecode/insert.el
@@ -33,6 +33,7 @@
 (require 'srecode/find)
 (require 'srecode/dictionary)
 (require 'srecode/args)
+(require 'srecode/filters)
 
 (defvar srecode-template-inserter-point)
 (declare-function srecode-overlaid-activate "srecode/fields")