     (">" . "&gt;")
     ("&" . "&amp;")
     ("@" . "&#064;")
+    ("/*" . "/&#042;")
+    ("*/" . "&#042;/")
     )
   "Table of characters that can't be used in Javadoc comments, mapped to their
 replacements.
 {jpw; 02/2012}")
 
 
-(defconst jpw-javadoc-invalid-chars-re  "[<>&@]"
-  "Regexp of characters that can't be used in Javadoc comments.
-{jpw; 02/2012}")
-
-
-(defconst jpw-javadoc-invalid-nontag-chars-re  "[&@]"
-  "Regexp of characters that can't be used in Javadoc comments, minus '<' and
-'>'
-{jpw; 02/2012}")
+(defconst jpw-javadoc-invalid-chars-re  "\\(?:[<>&@]\\|/\\*\\|\\*/\\)"
+  "Regexp of characters and substrings that can't be used in Javadoc
+comments.
+{jpw; 06/2012}")
+
+
+(defconst jpw-javadoc-invalid-nontag-chars-re  "\\(?:[&@]\\|/\\*\\|\\*/\\)"
+  "Like `jpw-javadoc-invalid-chars-re', but omitting the '<' and '>'
+characters.
+{jpw; 06/2012}")
 
 
 (defconst jpw-javadoc-chk-invalid-start-re

            (jdb-end (region-end))
            (subblock-start-mark (make-marker))
            (subblock-end-mark (make-marker))
            match-end-start-re);;end bindings
        (save-excursion
          (goto-char jdb-start)
          (while (re-search-forward jpw-javadoc-chk-invalid-start-re

    '>' with '&lt;'
    '&' with '&amp;'
    '@' with '&#064;'
    '/*' with '/&#042;'
    '*/' with '&#042;/'
{jpw: 06/2012}"

  (if (< end-mark start-mark)
      ;; Exchange marks that are out of order.
