summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Engster <deng@randomsample.de>2012-01-29 12:21:29 +0800
committerChong Yidong <cyd@gnu.org>2012-01-29 12:21:29 +0800
commitc6ddbd6890e0cad28e79d62c6e7a1422c54d10b7 (patch)
treeb81cc08756ce5a8758b16c39d0ad30a1e0a6666f
parent573559b413522025ebcfb41eab17ab5bb51da1a4 (diff)
downloademacs-c6ddbd6890e0cad28e79d62c6e7a1422c54d10b7.tar.gz
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
-rw-r--r--lisp/cedet/ChangeLog6
-rw-r--r--lisp/cedet/srecode/filters.el5
-rw-r--r--lisp/cedet/srecode/insert.el1
3 files changed, 10 insertions, 2 deletions
diff --git a/lisp/cedet/ChangeLog b/lisp/cedet/ChangeLog
index f9a546ec894..36fb9f13698 100644
--- 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 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")