Commit ac249c4c authored by Kenichi Handa's avatar Kenichi Handa
Browse files

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.
parent 14f56b66
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> 2005-03-10 Stefan Monnier <monnier@iro.umontreal.ca>
   
* help.el (describe-mode): Properly handle non-trivial lighters. * help.el (describe-mode): Properly handle non-trivial lighters.
......
;;; 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 ;; Copyright (C) 1985,86,92,94,95,96,97,1999,2001,02,03,2004
;; Free Software Foundation, Inc. ;; Free Software Foundation, Inc.
...@@ -87,7 +87,7 @@ reinserts the fill prefix in each resulting line." ...@@ -87,7 +87,7 @@ reinserts the fill prefix in each resulting line."
(defcustom adaptive-fill-regexp (defcustom adaptive-fill-regexp
;; Added `!' for doxygen comments starting with `//!' or `/*!'. ;; Added `!' for doxygen comments starting with `//!' or `/*!'.
;; Added `%' for TeX comments. ;; 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. "*Regexp to match text at start of line that constitutes indentation.
If Adaptive Fill mode is enabled, a prefix matching this pattern If Adaptive Fill mode is enabled, a prefix matching this pattern
on the first and second lines of a paragraph is used as the 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 ...@@ -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 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 at such places, which would normally allow breaking the line at those
places." places."
(or (looking-at "[ \t]*[])}»?!;:-]") (or (looking-at "[ \t]*[])},A;,b;(B?!;:-]")
(save-excursion (save-excursion
(skip-chars-backward " \t") (skip-chars-backward " \t")
(unless (bolp) (unless (bolp)
(backward-char 1) (backward-char 1)
(or (looking-at "[([{«]") (or (looking-at "[([{,A+,b+(B]")
;; Don't cut right after a single-letter word. ;; Don't cut right after a single-letter word.
(and (memq (preceding-char) '(?\t ?\ )) (and (memq (preceding-char) '(?\t ?\ ))
(eq (char-syntax (following-char)) ?w))))))) (eq (char-syntax (following-char)) ?w)))))))
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment