diff options
| author | Alan Mackenzie | 2011-11-03 22:03:18 +0000 |
|---|---|---|
| committer | Alan Mackenzie | 2011-11-03 22:03:18 +0000 |
| commit | 85ba4cded3ef5a834c880edfdb6cf7ec3a747e9b (patch) | |
| tree | 2a207d6e9e906119087ad357c892414db01211cb /lisp/cedet/semantic/java.el | |
| parent | a6ba2ab9277496b66f6939766a3470c1f0a84287 (diff) | |
| parent | 14e1d9eab9f4b7341f92397a0a9a2706f7b26ee9 (diff) | |
| download | emacs-85ba4cded3ef5a834c880edfdb6cf7ec3a747e9b.tar.gz emacs-85ba4cded3ef5a834c880edfdb6cf7ec3a747e9b.zip | |
Merge.
Diffstat (limited to 'lisp/cedet/semantic/java.el')
| -rw-r--r-- | lisp/cedet/semantic/java.el | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lisp/cedet/semantic/java.el b/lisp/cedet/semantic/java.el index 71a205386db..c3075634242 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." | |||
| 256 | (define-mode-local-override semantic-documentation-for-tag | 256 | (define-mode-local-override semantic-documentation-for-tag |
| 257 | java-mode (&optional tag nosnarf) | 257 | java-mode (&optional tag nosnarf) |
| 258 | "Find documentation from TAG and return it as a clean string. | 258 | "Find documentation from TAG and return it as a clean string. |
| 259 | Java has documentation set in a comment preceding TAG's definition. | 259 | Java have documentation set in a comment preceding TAG's definition. |
| 260 | Attempt to strip out comment syntactic sugar, unless optional argument | 260 | Attempt to strip out comment syntactic sugar, unless optional argument |
| 261 | NOSNARF is non-nil. | 261 | NOSNARF is non-nil. |
| 262 | If NOSNARF is 'lex, then return the semantic lex token." | 262 | If NOSNARF is 'lex, then return the semantic lex token." |