aboutsummaryrefslogtreecommitdiffstats
path: root/lisp
diff options
context:
space:
mode:
authorKenichi Handa2004-01-27 07:34:35 +0000
committerKenichi Handa2004-01-27 07:34:35 +0000
commitf43a0b9824cfaf3a74beca7e7fb55b62c00e3996 (patch)
treef6f28c1107a7aeba5e2af7fce5760266c5651c8f /lisp
parent21a3e65787947884b180b988398817130f731327 (diff)
downloademacs-f43a0b9824cfaf3a74beca7e7fb55b62c00e3996.tar.gz
emacs-f43a0b9824cfaf3a74beca7e7fb55b62c00e3996.zip
(fill-delete-newlines): Don't add a space if a
setence ends with one of a character in sentence-end-without-space.
Diffstat (limited to 'lisp')
-rw-r--r--lisp/ChangeLog9
-rw-r--r--lisp/textmodes/fill.el6
2 files changed, 14 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 8c6ec64fc4f..788231e9210 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,12 @@
12004-01-27 Kenichi Handa <handa@m17n.org>
2
3 * textmodes/paragraphs.el (sentence-end-without-space): New variable.
4 (sentence-end): Define using sentence-end-without-space.
5
6 * textmodes/fill.el (fill-delete-newlines): Don't add a space if a
7 setence ends with one of a character in
8 sentence-end-without-space.
9
12004-01-26 Stefan Monnier <monnier@iro.umontreal.ca> 102004-01-26 Stefan Monnier <monnier@iro.umontreal.ca>
2 11
3 * font-lock.el (font-lock): Add jit-lock as explicit group member. 12 * 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 69b17f677ff..5aded4a85e8 100644
--- 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."
423 ((string-match "\\[[^][]*\\(\\.\\)[^][]*\\]" sentence-end) 423 ((string-match "\\[[^][]*\\(\\.\\)[^][]*\\]" sentence-end)
424 (concat (replace-match ".:" nil nil sentence-end 1) "$")) 424 (concat (replace-match ".:" nil nil sentence-end 1) "$"))
425 ;; Can't find the right spot to insert the colon. 425 ;; Can't find the right spot to insert the colon.
426 (t "[.?!:][])}\"']*$")))) 426 (t "[.?!:][])}\"']*$")))
427 (sentence-end-without-space-list
428 (string-to-list sentence-end-without-space)))
427 (while (re-search-forward eol-double-space-re to t) 429 (while (re-search-forward eol-double-space-re to t)
428 (or (>= (point) to) (memq (char-before) '(?\t ?\ )) 430 (or (>= (point) to) (memq (char-before) '(?\t ?\ ))
431 (memq (char-after (match-beginning 0))
432 sentence-end-without-space-list)
429 (insert-and-inherit ?\ )))) 433 (insert-and-inherit ?\ ))))
430 434
431 (goto-char from) 435 (goto-char from)