diff options
| author | Joakim Verona | 2013-06-12 12:32:25 +0200 |
|---|---|---|
| committer | Joakim Verona | 2013-06-12 12:32:25 +0200 |
| commit | e6fa6da6899bf1b4877b96c450eae3934085d560 (patch) | |
| tree | 48e6fda463d24a792ec8428fb8044a250ee2ff82 /lisp/cedet/srecode/java.el | |
| parent | 4f0994366d33f8f76db4662cc126720866df3461 (diff) | |
| parent | 84d6f46535554f9f51aae3314313112e8d755c65 (diff) | |
| download | emacs-e6fa6da6899bf1b4877b96c450eae3934085d560.tar.gz emacs-e6fa6da6899bf1b4877b96c450eae3934085d560.zip | |
Merge branch 'trunk' into xwidget
Conflicts:
src/Makefile.in
src/keyboard.c
src/termhooks.h
Diffstat (limited to 'lisp/cedet/srecode/java.el')
| -rw-r--r-- | lisp/cedet/srecode/java.el | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/lisp/cedet/srecode/java.el b/lisp/cedet/srecode/java.el index 29a8465c45c..1b8922c2746 100644 --- a/lisp/cedet/srecode/java.el +++ b/lisp/cedet/srecode/java.el | |||
| @@ -27,6 +27,7 @@ | |||
| 27 | 27 | ||
| 28 | (require 'srecode/dictionary) | 28 | (require 'srecode/dictionary) |
| 29 | (require 'semantic/find) | 29 | (require 'semantic/find) |
| 30 | (require 'ede) | ||
| 30 | 31 | ||
| 31 | ;;;###autoload | 32 | ;;;###autoload |
| 32 | (defun srecode-semantic-handle-:java (dict) | 33 | (defun srecode-semantic-handle-:java (dict) |