(c-Java-javadoc-paragraph-start): New variable for use in c-fill-paragraph.

diff --git a/lisp/progmodes/cc-langs.el b/lisp/progmodes/cc-langs.el
index ec9308b3cc37f2b37617d8a22b3939a1715b9172..6aac38aa5321ae6daf576626db468d62a4cc21d2 100644 (file)
--- a/lisp/progmodes/cc-langs.el
+++ b/lisp/progmodes/cc-langs.el
@@ -27,7 +27,6 @@
 ;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
 ;; Boston, MA 02111-1307, USA.
 
-(require 'cc-defs)
 
 \f
 (require 'cc-defs)
@@ -163,6 +162,10 @@
 (defconst c-Java-defun-prompt-regexp
   "^[ \t]*\\(\\(\\(public\\|protected\\|private\\|const\\|abstract\\|synchronized\\|final\\|static\\|threadsafe\\|transient\\|native\\|volatile\\)\\s-+\\)*\\(\\(\\([[a-zA-Z][][_$.a-zA-Z0-9]*[][_$.a-zA-Z0-9]+\\|[[a-zA-Z]\\)\\s-*\\)\\s-+\\)\\)?\\(\\([[a-zA-Z][][_$.a-zA-Z0-9]*\\s-+\\)\\s-*\\)?\\([_a-zA-Z][^][ \t:;.,{}()\7f=]*\\|\\([_$a-zA-Z][_$.a-zA-Z0-9]*\\)\\)\\s-*\\(([^);{}]*)\\)?\\([] \t]*\\)\\(\\s-*\\<throws\\>\\s-*\\(\\([_$a-zA-Z][_$.a-zA-Z0-9]*\\)[, \t\n\r\f]*\\)+\\)?\\s-*")
 
+;; Regexp describing Javadoc markup that always starts paragraphs.
+(defconst c-Java-javadoc-paragraph-start
+  "@\\(author\\|exception\\|param\\|return\\|see\\|version\\)")
+
 
 \f
 ;; internal state variables