1 files changed, 5 insertions, 0 deletions

diff --git a/lisp/progmodes/c-mode.el b/lisp/progmodes/c-mode.el
index 91016c99b9b..a2478b6edfa 100644
--- a/lisp/progmodes/c-mode.el
+++ b/lisp/progmodes/c-mode.el
@@ -386,6 +386,11 @@ preserving the comment indentation or line-starting decorations."
                                      (point))))
                               (beginning-of-line)
                               (skip-chars-forward " \t*" max-prefix-end)
+                              ;; Don't include part of comment terminator
+                              ;; in the fill-prefix.
+                              (and (eq (following-char) ?/)
+                                   (eq (preceding-char) ?*)
+                                   (backward-char 1))
                               (point)))
 
                          ;; If the comment is only one line followed by a blank