From: Juri Linkov <juri@jurta.org>
Date: Fri, 30 Dec 2005 05:59:16 +0000 (+0000)
Subject: (fill-single-word-nobreak-p): Use `sentence-end'.
X-Git-Tag: emacs-pretest-22.0.90~4981
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=74f36ff05e066416c196b01e253f5652594879dd;p=emacs.git

(fill-single-word-nobreak-p): Use `sentence-end'.
---

diff --git a/lisp/textmodes/fill.el b/lisp/textmodes/fill.el
index ce95c6f026f..48defb7d786 100644
--- a/lisp/textmodes/fill.el
+++ b/lisp/textmodes/fill.el
@@ -291,12 +291,13 @@ act as a paragraph-separator."
 
 (defun fill-single-word-nobreak-p ()
   "Don't break a line after the first or before the last word of a sentence."
-  (or (looking-at "[ \t]*\\sw+[ \t]*[.?!:][ \t]*$")
+  (or (looking-at (concat "[ \t]*\\sw+" "\\(?:" (sentence-end) "\\)"))
       (save-excursion
 	(skip-chars-backward " \t")
 	(and (/= (skip-syntax-backward "w") 0)
 	     (/= (skip-chars-backward " \t") 0)
-	     (/= (skip-chars-backward ".?!:") 0)))))
+	     (/= (skip-chars-backward ".?!:") 0)
+	     (looking-at (sentence-end))))))
 
 (defun fill-french-nobreak-p ()
   "Return nil if French style allows breaking the line at point.