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

[Kenichi Handa]

Index: emacs/lisp/textmodes/fill.el
diff -c emacs/lisp/textmodes/fill.el:1.173 emacs/lisp/textmodes/fill.el:1.174
*** emacs/lisp/textmodes/fill.el:1.173  Tue Jul 20 20:51:13 2004
--- emacs/lisp/textmodes/fill.el        Fri Mar 11 02:04:05 2005
***************
*** 1,4 ****
! ;;; fill.el --- fill commands for Emacs
  
  ;; Copyright (C) 1985,86,92,94,95,96,97,1999,2001,02,03,2004
  ;;               Free Software Foundation, Inc.
--- 1,4 ----
! ;;; 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,93 ****
  (defcustom adaptive-fill-regexp
    ;; Added `!' for doxygen comments starting with `//!' or `/*!'.
    ;; Added `%' for TeX comments.
!   (purecopy "[ \t]*\\([-!|#%;>*]+[ \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
--- 87,93 ----
  (defcustom adaptive-fill-regexp
    ;; Added `!' for doxygen comments starting with `//!' or `/*!'.
    ;; Added `%' for TeX comments.
!   (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,315 ****
  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]*[])}»?!;:-]")
        (save-excursion
        (skip-chars-backward " \t")
        (unless (bolp)
          (backward-char 1)
!         (or (looking-at "[([{«]")
              ;; Don't cut right after a single-letter word.
              (and (memq (preceding-char) '(?\t ?\ ))
                   (eq (char-syntax (following-char)) ?w)))))))
--- 304,315 ----
  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?!;:-]")
        (save-excursion
        (skip-chars-backward " \t")
        (unless (bolp)
          (backward-char 1)
!         (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)))))))