[Emacs-diffs] /srv/bzr/emacs/trunk r106992: Fix require error when using srecode-insert.

[Chong Yidong]

------------------------------------------------------------
revno: 106992
fixes bug(s): http://debbugs.gnu.org/9967
author: David Engster <address@hidden>
committer: Chong Yidong <address@hidden>
branch nick: trunk
timestamp: Sun 2012-01-29 12:21:29 +0800
message:
  Fix require error when using srecode-insert.
  
  * lisp/cedet/srecode/insert.el: Require srecode/filters.
  * lisp/cedet/srecode/filters.el: Drop two requires.
modified:
  lisp/cedet/ChangeLog
  lisp/cedet/srecode/filters.el
  lisp/cedet/srecode/insert.el

=== modified file 'lisp/cedet/ChangeLog'
--- a/lisp/cedet/ChangeLog      2012-01-19 07:21:25 +0000
+++ b/lisp/cedet/ChangeLog      2012-01-29 04:21:29 +0000
@@ -1,3 +1,9 @@
+2012-01-29  David Engster  <address@hidden>
+
+       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  <address@hidden>
 
        * ede.el (ede-project-directories): New option.

=== modified file 'lisp/cedet/srecode/filters.el'
--- a/lisp/cedet/srecode/filters.el     2012-01-19 07:21:25 +0000
+++ b/lisp/cedet/srecode/filters.el     2012-01-29 04:21:29 +0000
@@ -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."

=== modified file 'lisp/cedet/srecode/insert.el'
--- a/lisp/cedet/srecode/insert.el      2012-01-19 07:21:25 +0000
+++ b/lisp/cedet/srecode/insert.el      2012-01-29 04:21:29 +0000
@@ -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")