(fill-delete-newlines): Don't add a space if a

setence ends with one of a character in
sentence-end-without-space.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 8c6ec64fc4fa286ebfd2b1e2ab059908ba9d1c27..788231e9210132264bbe2e8d151bfa13b94d16a2 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,12 @@
+2004-01-27  Kenichi Handa  <handa@m17n.org>
+
+       * textmodes/paragraphs.el (sentence-end-without-space): New variable.
+       (sentence-end): Define using sentence-end-without-space.
+
+       * textmodes/fill.el (fill-delete-newlines): Don't add a space if a
+       setence ends with one of a character in
+       sentence-end-without-space.
+
 2004-01-26  Stefan Monnier  <monnier@iro.umontreal.ca>
 
        * font-lock.el (font-lock): Add jit-lock as explicit group member.

diff --git a/lisp/textmodes/fill.el b/lisp/textmodes/fill.el
index 69b17f677ff7e7564b3d56ee74332a5d0bc2fc57..5aded4a85e8663043c3454c2a1184b781f64b19b 100644 (file)
--- a/lisp/textmodes/fill.el
+++ b/lisp/textmodes/fill.el
@@ -423,9 +423,13 @@ Point is moved to just past the fill prefix on the first line."
          ((string-match "\\[[^][]*\\(\\.\\)[^][]*\\]" sentence-end)
           (concat (replace-match ".:" nil nil sentence-end 1) "$"))
          ;; Can't find the right spot to insert the colon.
-         (t "[.?!:][])}\"']*$"))))
+         (t "[.?!:][])}\"']*$")))
+       (sentence-end-without-space-list
+        (string-to-list sentence-end-without-space)))
     (while (re-search-forward eol-double-space-re to t)
       (or (>= (point) to) (memq (char-before) '(?\t ?\ ))
+         (memq (char-after (match-beginning 0)) 
+               sentence-end-without-space-list)
          (insert-and-inherit ?\ ))))
 
   (goto-char from)