(fill-comment-paragraph): Obey indent-tabs-mode.

diff --git a/lisp/textmodes/fill.el b/lisp/textmodes/fill.el
index 2ac09f11256c72cfdc9ac87f8d1ab3d857043339..aaa10fbce5f51a67b6193ed70d8ecc497d8fa6f1 100644 (file)
--- a/lisp/textmodes/fill.el
+++ b/lisp/textmodes/fill.el
@@ -811,9 +811,13 @@ can take care of filling.  JUSTIFY is used as in `fill-paragraph'."
              (save-excursion
                (goto-char comstart)
                (if has-code-and-comment
-                   (concat (make-string (/ (current-column) tab-width) ?\t)
-                           (make-string (% (current-column) tab-width) ?\ )
-                           (buffer-substring (point) comin))
+                   (concat
+                    (if (not indent-tabs-mode)
+                        (make-string (current-column) ?\ )
+                      (concat
+                       (make-string (/ (current-column) tab-width) ?\t)
+                       (make-string (% (current-column) tab-width) ?\ )))
+                    (buffer-substring (point) comin))
                  (buffer-substring (line-beginning-position) comin))))
             beg end)
        (save-excursion