diff options
| author | Paul Eggert | 2012-02-10 10:58:48 -0800 |
|---|---|---|
| committer | Paul Eggert | 2012-02-10 10:58:48 -0800 |
| commit | 6e6c82a4e687708d5a7a3887f92db45bd74da276 (patch) | |
| tree | 85dc3105240e84a8cddadb25d572e170fcdbd8bc /lisp/cedet/srecode | |
| parent | 78df1fb1d46d556bfc2698ca1802972b13613ba8 (diff) | |
| parent | cc26d239af9a82cff079556a1daff4b4bf60eb5c (diff) | |
| download | emacs-6e6c82a4e687708d5a7a3887f92db45bd74da276.tar.gz emacs-6e6c82a4e687708d5a7a3887f92db45bd74da276.zip | |
Merge from trunk.
Diffstat (limited to 'lisp/cedet/srecode')
| -rw-r--r-- | lisp/cedet/srecode/filters.el | 5 | ||||
| -rw-r--r-- | lisp/cedet/srecode/insert.el | 1 |
2 files changed, 4 insertions, 2 deletions
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 @@ | |||
| 26 | ;;; Code: | 26 | ;;; Code: |
| 27 | 27 | ||
| 28 | (require 'newcomment) | 28 | (require 'newcomment) |
| 29 | (require 'srecode/table) | 29 | |
| 30 | (require 'srecode/insert) | 30 | (declare-function srecode-dictionary-lookup-name "srecode/dictionary") |
| 31 | (defvar srecode-inserter-variable-current-dictionary) | ||
| 31 | 32 | ||
| 32 | (defun srecode-comment-prefix (str) | 33 | (defun srecode-comment-prefix (str) |
| 33 | "Prefix each line of STR with the comment prefix characters." | 34 | "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 @@ | |||
| 33 | (require 'srecode/find) | 33 | (require 'srecode/find) |
| 34 | (require 'srecode/dictionary) | 34 | (require 'srecode/dictionary) |
| 35 | (require 'srecode/args) | 35 | (require 'srecode/args) |
| 36 | (require 'srecode/filters) | ||
| 36 | 37 | ||
| 37 | (defvar srecode-template-inserter-point) | 38 | (defvar srecode-template-inserter-point) |
| 38 | (declare-function srecode-overlaid-activate "srecode/fields") | 39 | (declare-function srecode-overlaid-activate "srecode/fields") |