1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2025-12-15 10:30:25 -08:00

Merge from emacs--rel--22

Revision: emacs@sv.gnu.org/emacs--devo--0--patch-1090
This commit is contained in:
Miles Bader 2008-03-01 01:28:31 +00:00
commit 51fb064bc7
15 changed files with 145 additions and 63 deletions

View file

@ -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