diff options
| author | Kenichi Handa | 2011-12-05 16:03:31 +0900 |
|---|---|---|
| committer | Kenichi Handa | 2011-12-05 16:03:31 +0900 |
| commit | 2ab04b956544fc24132cee405f93c1a757ebca56 (patch) | |
| tree | f8ff3a51bac0430ed69b6497568de699f6d3b904 /test/cedet/tests | |
| parent | a79703f53ccd12623371263d93baf0d1be928ec7 (diff) | |
| parent | 58a70b943c3efcc25e1396c8e67bc440c43a3f0a (diff) | |
| download | emacs-2ab04b956544fc24132cee405f93c1a757ebca56.tar.gz emacs-2ab04b956544fc24132cee405f93c1a757ebca56.zip | |
merge trunk
Diffstat (limited to 'test/cedet/tests')
| -rw-r--r-- | test/cedet/tests/test.el | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/test/cedet/tests/test.el b/test/cedet/tests/test.el index 8a95572c497..57056b8065b 100644 --- a/test/cedet/tests/test.el +++ b/test/cedet/tests/test.el | |||
| @@ -144,7 +144,7 @@ | |||
| 144 | this | 144 | this |
| 145 | that) | 145 | that) |
| 146 | 146 | ||
| 147 | (define-mode-local-override a-overriden-function | 147 | (define-mode-local-override a-overridden-function |
| 148 | emacs-lisp-mode (tag) | 148 | emacs-lisp-mode (tag) |
| 149 | "A function that is overloaded." | 149 | "A function that is overloaded." |
| 150 | nil) | 150 | nil) |