* cedet/srecode/insert.el: Require srecode/args.

* cedet/srecode/args.el: Require srecode/dictionary instead of
srecode/insert.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 7ab1f0931b283e50bf01274bd72568394562f960..024848e50dba8998205fcbac9c5a1e4357454b3c 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,10 @@
 2009-10-03  Chong Yidong  <cyd@stupidchicken.com>
 
+       * cedet/srecode/insert.el: Require srecode/args.
+
+       * cedet/srecode/args.el: Require srecode/dictionary instead of
+       srecode/insert.
+
        * cedet/srecode/srt-mode.el (srecode-template-mode): Doc fix.
 
        * files.el (auto-mode-alist): Add .srt and Project.ede.

diff --git a/lisp/cedet/srecode/args.el b/lisp/cedet/srecode/args.el
index 72bbd1b075119cfddd51793d756b5d4df3131d57..951dae4d3276514500d17f123d85f14e21ee119b 100644 (file)
--- a/lisp/cedet/srecode/args.el
+++ b/lisp/cedet/srecode/args.el
@@ -25,7 +25,7 @@
 ;; sets of dictionary words that need to be derived.  This file contains
 ;; a set of simple arguments for srecode templates.
 
-(require 'srecode/insert)
+(require 'srecode/dictionary)
 
 ;;; Code:
 

diff --git a/lisp/cedet/srecode/insert.el b/lisp/cedet/srecode/insert.el
index b85ae4329f4cda585311cb3891c2878bc9752760..7b71a4a0873182a9cc8c42b2b009c05d92cfd7d8 100644 (file)
--- a/lisp/cedet/srecode/insert.el
+++ b/lisp/cedet/srecode/insert.el
@@ -29,6 +29,7 @@
 (require 'srecode/compile)
 (require 'srecode/find)
 (require 'srecode/dictionary)
+(require 'srecode/args)
 
 (defvar srecode-template-inserter-point)
 (declare-function srecode-overlaid-activate "srecode/fields")