Fix require error when using srecode-insert.

* lisp/cedet/srecode/insert.el: Require srecode/filters.
* lisp/cedet/srecode/filters.el: Drop two requires.

Fixes: debbugs:9967

diff --git a/lisp/cedet/ChangeLog b/lisp/cedet/ChangeLog
index f9a546ec894971b32fb8de24c1eaf505df2d4774..36fb9f13698332fc17f54e33ffd1f99203723956 100644 (file)
--- a/lisp/cedet/ChangeLog
+++ b/lisp/cedet/ChangeLog
@@ -1,3 +1,9 @@
+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.

diff --git a/lisp/cedet/srecode/filters.el b/lisp/cedet/srecode/filters.el
index 67435f23e90444f9516de64557767b71ea769e5d..d4a7e542770c3bafea97962092da697476613cf9 100644 (file)
--- 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 40d3374c7447ddc0dcfa630a294450a10f94f859..7d300614c086e9365dce3efa357c26c42bfa7bf3 100644 (file)
--- 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")