diff options
| author | Paul Eggert | 2011-03-01 17:52:03 -0800 |
|---|---|---|
| committer | Paul Eggert | 2011-03-01 17:52:03 -0800 |
| commit | ba46f4d85a6938273f52a8cdf7e09d9afee61d7f (patch) | |
| tree | 606ec46b703532d463ccddf287f0053430eb1f4a /lisp/cedet/semantic/java.el | |
| parent | d9d0d182da35312ed0d7a9859b9c6a03994d86d8 (diff) | |
| parent | 0dc3e4109e0c41bbf5fdcae0ff1156162719693e (diff) | |
| download | emacs-ba46f4d85a6938273f52a8cdf7e09d9afee61d7f.tar.gz emacs-ba46f4d85a6938273f52a8cdf7e09d9afee61d7f.zip | |
Merge from mainline.
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 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." | |||
| 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 have documentation set in a comment preceeding TAG's definition. | 259 | Java has 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." |