Mercurial > emacs
changeset 60561:7f57e96cf880
Change encoding to iso-2022-7bit and add coding: tag.
(adaptive-fill-regexp): Add more bullets.
(fill-french-nobreak-p): Add Latin-1 and Latin-9 guillemets in
regexps.
| author | Kenichi Handa <handa@m17n.org> |
|---|---|
| date | Fri, 11 Mar 2005 02:04:05 +0000 |
| parents | 003f15290687 |
| children | 231ce7de960a |
| files | lisp/textmodes/fill.el |
| diffstat | 1 files changed, 4 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/textmodes/fill.el Thu Mar 10 23:31:53 2005 +0000 +++ b/lisp/textmodes/fill.el Fri Mar 11 02:04:05 2005 +0000 @@ -1,4 +1,4 @@ -;;; fill.el --- fill commands for Emacs +;;; fill.el --- fill commands for Emacs -*- coding: iso-2022-7bit -*- ;; Copyright (C) 1985,86,92,94,95,96,97,1999,2001,02,03,2004 ;; Free Software Foundation, Inc. @@ -87,7 +87,7 @@ (defcustom adaptive-fill-regexp ;; Added `!' for doxygen comments starting with `//!' or `/*!'. ;; Added `%' for TeX comments. - (purecopy "[ \t]*\\([-!|#%;>*]+[ \t]*\\|(?[0-9]+[.)][ \t]*\\)*") + (purecopy "[ \t]*\\([-!|#%;>*,A7$,1s"s#sC$,2"F(B]+[ \t]*\\|(?[0-9]+[.)][ \t]*\\)*") "*Regexp to match text at start of line that constitutes indentation. If Adaptive Fill mode is enabled, a prefix matching this pattern on the first and second lines of a paragraph is used as the @@ -304,12 +304,12 @@ mark such as `?' or `:'. It is common in French writing to put a space at such places, which would normally allow breaking the line at those places." - (or (looking-at "[ \t]*[])}»?!;:-]") + (or (looking-at "[ \t]*[])},A;,b;(B?!;:-]") (save-excursion (skip-chars-backward " \t") (unless (bolp) (backward-char 1) - (or (looking-at "[([{«]") + (or (looking-at "[([{,A+,b+(B]") ;; Don't cut right after a single-letter word. (and (memq (preceding-char) '(?\t ?\ )) (eq (char-syntax (following-char)) ?w)))))))