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.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 6423787b7a675c1b6c762ead883ffb7251d23a39..433260be0ea46bc45c2c40a34597fafe65196ede 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,13 @@
+2005-03-11  Kenichi Handa  <handa@m17n.org>
+
+       These changes are suggested by Dave Love <fx@gnu.org>.
+
+       * textmodes/fill.el: 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.
+
 2005-03-10  Stefan Monnier  <monnier@iro.umontreal.ca>
 
        * help.el (describe-mode): Properly handle non-trivial lighters.

diff --git a/lisp/textmodes/fill.el b/lisp/textmodes/fill.el
index dfd471a87c4f96edaad814b00a28410bd1731ecd..ccd7f21f502688971f14b41bb3b78ff36682ddcd 100644 (file)
--- a/lisp/textmodes/fill.el
+++ b/lisp/textmodes/fill.el
@@ -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 @@ reinserts the fill prefix in each resulting line."
 (defcustom adaptive-fill-regexp
   ;; Added `!' for doxygen comments starting with `//!' or `/*!'.
   ;; Added `%' for TeX comments.
-  (purecopy "[ \t]*\\([-!|#%;>*]+[ \t]*\\|(?[0-9]+[.)][ \t]*\\)*")
+  (purecopy "[ \t]*\\([-!|#%;>*\e,A7\e$,1s"s#sC\e$,2"F\e(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 @@ after an opening paren or just before a closing paren or a punctuation
 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]*[])}\e,A;\e,b;\e(B?!;:-]")
       (save-excursion
        (skip-chars-backward " \t")
        (unless (bolp)
          (backward-char 1)
-         (or (looking-at "[([{«]")
+         (or (looking-at "[([{\e,A+\e,b+\e(B]")
              ;; Don't cut right after a single-letter word.
              (and (memq (preceding-char) '(?\t ?\ ))
                   (eq (char-syntax (following-char)) ?w)))))))