X-Git-Url: https://code.delx.au/gnu-emacs/blobdiff_plain/4628bef1eea0f60e846fe6b6591725aa92952de9..3fc9b2184582296ffe4a602d87534f35ba4b4919:/lisp/textmodes/paragraphs.el

diff --git a/lisp/textmodes/paragraphs.el b/lisp/textmodes/paragraphs.el
index 4f1bcefa90..59454043c4 100644
--- a/lisp/textmodes/paragraphs.el
+++ b/lisp/textmodes/paragraphs.el
@@ -1,7 +1,6 @@
 ;;; paragraphs.el --- paragraph and sentence parsing
 
-;; Copyright (C) 1985, 1986, 1987, 1991, 1994, 1995, 1996, 1997, 1999, 2000,
-;;   2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
+;; Copyright (C) 1985-1987, 1991, 1994-1997, 1999-2011
 ;;   Free Software Foundation, Inc.
 
 ;; Maintainer: FSF
@@ -44,7 +43,7 @@ only considered as a candidate to match `paragraph-start' or
 
 Prefix argument says to turn mode on if positive, off if negative.
 When the mode is turned on, if there are newlines in the buffer but no hard
-newlines, ask the user whether to mark as hard any newlines preceeding a
+newlines, ask the user whether to mark as hard any newlines preceding a
 `paragraph-start' line.  From a program, second arg INSERT specifies whether
 to do this; it can be `never' to change nothing, t or `always' to force
 marking, `guess' to try to do the right thing with no questions, nil
@@ -457,21 +456,25 @@ sentences.  Also, every paragraph boundary terminates sentences as well."
         (sentence-end (sentence-end)))
     (while (< arg 0)
       (let ((pos (point))
-	    ;; We used to use (start-of-paragraph-text), but this can
-	    ;; prevent sentence-end from matching if it is anchored at
-	    ;; BOL and the paragraph starts indented.
-	    (par-beg (save-excursion (backward-paragraph) (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)))
+	    (par-beg
+	     (save-excursion
+	       (start-of-paragraph-text)
+	       ;; Move PAR-BEG back over indentation
+	       ;; to allow s1entence-end to match if it is anchored at
+	       ;; BOL and the paragraph starts indented.
+	       (beginning-of-line)
+	       (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)
       (let ((par-end (save-excursion (end-of-paragraph-text) (point))))
-       (if (re-search-forward sentence-end par-end t)
-	   (skip-chars-backward " \t\n")
-	 (goto-char par-end)))
+	(if (re-search-forward sentence-end par-end t)
+	    (skip-chars-backward " \t\n")
+	  (goto-char par-end)))
       (setq arg (1- arg)))
     (constrain-to-field nil opoint t)))
 
@@ -529,5 +532,4 @@ the current sentence with the one containing the mark."
 ;; coding: utf-8
 ;; End:
 
-;; arch-tag: e727eb1a-527a-4464-b9d7-9d3ec0d1a575
 ;;; paragraphs.el ends here