summaryrefslogtreecommitdiff
path: root/test/cedet/tests/test.el
diff options
context:
space:
mode:
authorPaul Eggert <eggert@cs.ucla.edu>2011-12-10 16:56:50 -0800
committerPaul Eggert <eggert@cs.ucla.edu>2011-12-10 16:56:50 -0800
commit8f50130c565eaf0ad7c49e4ad044c3291ecdfa71 (patch)
treec8129448cbbf387fe82667ccac02983592c688f1 /test/cedet/tests/test.el
parent85a83e2e2585a1906dec5168ed96ad521b5849ed (diff)
parent7b9d523a07395ecea505be88f45c33d73aea7038 (diff)
downloademacs-8f50130c565eaf0ad7c49e4ad044c3291ecdfa71.tar.gz
Merge from trunk.
Diffstat (limited to 'test/cedet/tests/test.el')
-rw-r--r--test/cedet/tests/test.el2
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 @@
this
that)
-(define-mode-local-override a-overriden-function
+(define-mode-local-override a-overridden-function
emacs-lisp-mode (tag)
"A function that is overloaded."
nil)