diff options
| author | Miles Bader <miles@gnu.org> | 2008-03-01 01:28:31 +0000 |
|---|---|---|
| committer | Miles Bader <miles@gnu.org> | 2008-03-01 01:28:31 +0000 |
| commit | 51fb064bc72968e739e8dea580e58796c1a87f4c (patch) | |
| tree | 80c29b96dbb547a7c8db57a6d57ae4c6d2bfc1ca /lisp/textmodes | |
| parent | 14e8de0c3f87a228c05902be66c5bcf953636611 (diff) | |
| parent | 613f60eeb171e5ad881f52d9e7c0ffce2e182fcb (diff) | |
| download | emacs-51fb064bc72968e739e8dea580e58796c1a87f4c.tar.gz | |
Merge from emacs--rel--22
Revision: emacs@sv.gnu.org/emacs--devo--0--patch-1090
Diffstat (limited to 'lisp/textmodes')
| -rw-r--r-- | lisp/textmodes/fill.el | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/lisp/textmodes/fill.el b/lisp/textmodes/fill.el index 6fa26afa4f5..7f7a98e087a 100644 --- a/lisp/textmodes/fill.el +++ b/lisp/textmodes/fill.el @@ -855,7 +855,13 @@ can take care of filling. JUSTIFY is used as in `fill-paragraph'." (goto-char comstart) (skip-chars-backward " \t") (setq has-code-and-comment (not (bolp))))) - (if (not comstart) + (if (not (and comstart + ;; Make sure the comment-start mark we found is accepted by + ;; comment-start-skip. If not, all bets are off, and + ;; we'd better not mess with it. + (string-match comment-start-skip + (buffer-substring comstart comin)))) + ;; Return nil, so the normal filling will take place. nil |