[Emacs-diffs] emacs/lisp ChangeLog textmodes/fill.el

[Stefan Monnier]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Stefan Monnier <monnier>        09/09/22 15:53:04

Modified files:
        lisp           : ChangeLog 
        lisp/textmodes : fill.el 

Log message:
        Convert to utf-8 encoding.
        (fill-french-nobreak-p): Remove redundant » and « inherited from our
        pre-unicode days.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/ChangeLog?cvsroot=emacs&r1=1.16232&r2=1.16233
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/textmodes/fill.el?cvsroot=emacs&r1=1.223&r2=1.224

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/emacs/emacs/lisp/ChangeLog,v
retrieving revision 1.16232
retrieving revision 1.16233
diff -u -b -r1.16232 -r1.16233
--- ChangeLog   22 Sep 2009 15:39:02 -0000      1.16232
+++ ChangeLog   22 Sep 2009 15:53:00 -0000      1.16233
@@ -1,5 +1,9 @@
 2009-09-22  Stefan Monnier  <address@hidden>
 
+       * 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

Index: textmodes/fill.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/textmodes/fill.el,v
retrieving revision 1.223
retrieving revision 1.224
diff -u -b -r1.223 -r1.224
--- textmodes/fill.el   8 Apr 2009 04:02:35 -0000       1.223
+++ textmodes/fill.el   22 Sep 2009 15:53:03 -0000      1.224
@@ -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 @@
   ;; 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 @@
 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)))))))