Convert to utf-8 encoding.

(fill-french-nobreak-p): Remove redundant » and « inherited from our
pre-unicode days.

2 files changed, 8 insertions, 4 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 820724277d9..2383aac9d96 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,9 @@
 2009-09-22  Stefan Monnier  <monnier@iro.umontreal.ca>
 
+        * textmodes/fill.el: Convert to utf-8 encoding.
+        (fill-french-nobreak-p): Remove redundant » and « inherited from our
+        pre-unicode days.
+
         * add-log.el (change-log-fill-forward-paragraph): New function.
         (change-log-mode): Use it so fill-region DTRT.
         Set fill-indent-according-to-mode here rather than in
diff --git a/lisp/textmodes/fill.el b/lisp/textmodes/fill.el
index c3ec0b95cb4..26dec949e90 100644
--- a/lisp/textmodes/fill.el
+++ b/lisp/textmodes/fill.el
@@ -1,4 +1,4 @@
-;;; fill.el --- fill commands for Emacs         -*- coding: iso-2022-7bit -*-
+;;; fill.el --- fill commands for Emacs         -*- coding: utf-8 -*-
 
 ;; Copyright (C) 1985, 1986, 1992, 1994, 1995, 1996, 1997, 1999, 2001, 2002,
 ;;   2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
@@ -92,7 +92,7 @@ reinserts the fill prefix in each resulting line."
   ;; Added `!' for doxygen comments starting with `//!' or `/*!'.
   ;; Added `%' for TeX comments.
   ;; RMS: deleted the code to match `1.' and `(1)'.
-  "[ \t]*\\([-!|#%;>*,A7$,1s"s#sC$,2"F(B]+[ \t]*\\)*"
+  "[ \t]*\\([-!|#%;>*·•‣⁃◦]+[ \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
@@ -317,12 +317,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]*[])},A;,b;(B?!;:-]")
+  (or (looking-at "[ \t]*[])}»?!;:-]")
       (save-excursion
         (skip-chars-backward " \t")
         (unless (bolp)
           (backward-char 1)
-          (or (looking-at "[([{,A+,b+(B]")
+          (or (looking-at "[([{«]")
               ;; Don't cut right after a single-letter word.
               (and (memq (preceding-char) '(?\t ?\s))
                    (eq (char-syntax (following-char)) ?w)))))))