(forward-sentence): Avoid building

a regexp from sentence-end.  From Kenichi Handa <handa@etl.go.jp>.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 83215282a8ec18096ca12c2d3f37071d160a02cf..0514c8b190b294bb2957b8fbf93d896f7206492f 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,8 @@
 2001-08-07  Gerd Moellmann  <gerd@gnu.org>
 
+       * textmodes/paragraphs.el (forward-sentence): Avoid building
+       a regexp from sentence-end.  From Kenichi Handa <handa@etl.go.jp>.
+
        * progmodes/executable.el (executable-set-magic): If 
        executable-find returns a quoted file name, unquote it before
        inserting it.

diff --git a/lisp/textmodes/paragraphs.el b/lisp/textmodes/paragraphs.el
index 172c2cdf35c847d9c19b921ba8094cdba155c133..792b3b0cd09bc046e36c12624f573c00dc97f58c 100644 (file)
--- a/lisp/textmodes/paragraphs.el
+++ b/lisp/textmodes/paragraphs.el
@@ -369,10 +369,12 @@ sentences.  Also, every paragraph boundary terminates sentences as well."
   (or arg (setq arg 1))
   (let ((opoint (point)))
     (while (< arg 0)
-      (let ((par-beg (save-excursion (start-of-paragraph-text) (point))))
-       (if (re-search-backward (concat "\\(" sentence-end "\\)[^ \t\n]")
-                              par-beg t)
-          (goto-char (1- (match-end 0)))
+      (let ((pos (point))
+           (par-beg (save-excursion (start-of-paragraph-text) (point))))
+       (if (and (re-search-backward sentence-end par-beg t)
+               (or (< (match-end 0) pos)
+                   (re-search-backward sentence-end par-beg t)))
+          (goto-char (match-end 0))
         (goto-char par-beg)))
       (setq arg (1+ arg)))
     (while (> arg 0)