diff options
| author | Michaël Cadilhac <[email protected]> | 2006-12-24 20:23:31 +0000 |
|---|---|---|
| committer | Michaël Cadilhac <[email protected]> | 2006-12-24 20:23:31 +0000 |
| commit | 2a096cafa0eac4afd665849424ba7fd21636fc20 (patch) | |
| tree | ec3f575a4cc049d803bc7a625281395befa6e918 /lisp | |
| parent | 90dd8ef0a81a1d2d4f06865ea27f83ec561ecd9f (diff) | |
(fill-comment-paragraph): Prevent the use of an optimized comment regexp if
`comment-start-skip' uses a ^.
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/textmodes/fill.el | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 98c64bab78..048299c85c 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,5 +1,10 @@ 2006-12-24 Micha�l Cadilhac <[email protected]> + * textmodes/fill.el (fill-comment-paragraph): Prevent the use of + an optimized comment regexp if `comment-start-skip' uses a ^. + +2006-12-24 Micha�l Cadilhac <[email protected]> + * bs.el (bs--up): Remove interactive spec. 2006-12-24 Chong Yidong <[email protected]> diff --git a/lisp/textmodes/fill.el b/lisp/textmodes/fill.el index e5b3a64db8..3fec7a31b9 100644 --- a/lisp/textmodes/fill.el +++ b/lisp/textmodes/fill.el @@ -838,7 +838,7 @@ can take care of filling. JUSTIFY is used as in `fill-paragraph'." (commark (comment-string-strip (buffer-substring comstart comin) nil t)) (comment-re - (if (string-match comment-start-skip (concat commark "a")) + (if (string-match comment-start-skip (concat "\0" commark "a")) (concat "[ \t]*" (regexp-quote commark) ;; Make sure we only match comments that use ;; the exact same comment marker. |