summaryrefslogtreecommitdiff
path: root/lisp/cedet/semantic/java.el
diff options
context:
space:
mode:
authorGlenn Morris <rgm@gnu.org>2011-02-27 17:07:29 -0800
committerGlenn Morris <rgm@gnu.org>2011-02-27 17:07:29 -0800
commit2b0c7330457b8ca42375c92ada7dc7cefb0fa9fb (patch)
treeb924eb1c22ab3bce643676162ef039f250782661 /lisp/cedet/semantic/java.el
parentdf7f0d0b10ce31a6f1a8b7e979e120c695699d5a (diff)
parentd1f61aaf6f0b6a2cf2bbb7eaf5631f8b580568d4 (diff)
downloademacs-2b0c7330457b8ca42375c92ada7dc7cefb0fa9fb.tar.gz
emacs-2b0c7330457b8ca42375c92ada7dc7cefb0fa9fb.tar.bz2
emacs-2b0c7330457b8ca42375c92ada7dc7cefb0fa9fb.zip
Merge from emacs-23; up to 2010-06-03T05:41:49Z!rgm@gnu.org.
Diffstat (limited to 'lisp/cedet/semantic/java.el')
-rw-r--r--lisp/cedet/semantic/java.el2
1 files changed, 1 insertions, 1 deletions
diff --git a/lisp/cedet/semantic/java.el b/lisp/cedet/semantic/java.el
index 4489d0ffae5..71a205386db 100644
--- a/lisp/cedet/semantic/java.el
+++ b/lisp/cedet/semantic/java.el
@@ -256,7 +256,7 @@ Optional argument COLOR indicates that color should be mixed in."
(define-mode-local-override semantic-documentation-for-tag
java-mode (&optional tag nosnarf)
"Find documentation from TAG and return it as a clean string.
-Java have documentation set in a comment preceeding TAG's definition.
+Java has documentation set in a comment preceding TAG's definition.
Attempt to strip out comment syntactic sugar, unless optional argument
NOSNARF is non-nil.
If NOSNARF is 'lex, then return the semantic lex token."