aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChong Yidong2009-10-03 19:43:07 +0000
committerChong Yidong2009-10-03 19:43:07 +0000
commita70bfe61c012cb15c42d7df18d36d3650ad6071b (patch)
tree6ca5e379255f5e0645a1036e2e5667701974aac8
parentc05676c5ac4c1722bcac8a31668f5fab2e7ae6d4 (diff)
downloademacs-a70bfe61c012cb15c42d7df18d36d3650ad6071b.tar.gz
emacs-a70bfe61c012cb15c42d7df18d36d3650ad6071b.zip
* cedet/srecode/insert.el: Require srecode/args.
* cedet/srecode/args.el: Require srecode/dictionary instead of srecode/insert.
-rw-r--r--lisp/ChangeLog5
-rw-r--r--lisp/cedet/srecode/args.el2
-rw-r--r--lisp/cedet/srecode/insert.el1
3 files changed, 7 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 7ab1f0931b2..024848e50db 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,10 @@
12009-10-03 Chong Yidong <cyd@stupidchicken.com> 12009-10-03 Chong Yidong <cyd@stupidchicken.com>
2 2
3 * cedet/srecode/insert.el: Require srecode/args.
4
5 * cedet/srecode/args.el: Require srecode/dictionary instead of
6 srecode/insert.
7
3 * cedet/srecode/srt-mode.el (srecode-template-mode): Doc fix. 8 * cedet/srecode/srt-mode.el (srecode-template-mode): Doc fix.
4 9
5 * files.el (auto-mode-alist): Add .srt and Project.ede. 10 * 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 72bbd1b0751..951dae4d327 100644
--- a/lisp/cedet/srecode/args.el
+++ b/lisp/cedet/srecode/args.el
@@ -25,7 +25,7 @@
25;; sets of dictionary words that need to be derived. This file contains 25;; sets of dictionary words that need to be derived. This file contains
26;; a set of simple arguments for srecode templates. 26;; a set of simple arguments for srecode templates.
27 27
28(require 'srecode/insert) 28(require 'srecode/dictionary)
29 29
30;;; Code: 30;;; Code:
31 31
diff --git a/lisp/cedet/srecode/insert.el b/lisp/cedet/srecode/insert.el
index b85ae4329f4..7b71a4a0873 100644
--- a/lisp/cedet/srecode/insert.el
+++ b/lisp/cedet/srecode/insert.el
@@ -29,6 +29,7 @@
29(require 'srecode/compile) 29(require 'srecode/compile)
30(require 'srecode/find) 30(require 'srecode/find)
31(require 'srecode/dictionary) 31(require 'srecode/dictionary)
32(require 'srecode/args)
32 33
33(defvar srecode-template-inserter-point) 34(defvar srecode-template-inserter-point)
34(declare-function srecode-overlaid-activate "srecode/fields") 35(declare-function srecode-overlaid-activate "srecode/fields")