X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=lisp%2Fparagraphs.el;h=f26eb4291f73aac5740c0c967a98b33b668cd618;hb=89d935bfb8bf9cab3d99f71af40c2afbea401c96;hp=98b558bb2d006128e80a8ae844c5c679a8c71b69;hpb=6883ee56ec887c2c48abe5b06b5e66aa74031910;p=chise%2Fxemacs-chise.git-

diff --git a/lisp/paragraphs.el b/lisp/paragraphs.el
index 98b558b..f26eb42 100644
--- a/lisp/paragraphs.el
+++ b/lisp/paragraphs.el
@@ -57,7 +57,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 
@@ -99,8 +99,7 @@ to paragraphs.  The fill functions insert and delete only soft newlines."
 			       (point) (1+ (point))))))))))))
     (setq use-hard-newlines t)))
 
-;; XEmacs - use purecopy
-(defconst paragraph-start (purecopy "[ \t\n\f]") "\
+(defconst paragraph-start "[ \t\n\f]" "\
 *Regexp for beginning of a line that starts OR separates paragraphs.
 This regexp should match lines that separate paragraphs
 and should also match lines that start a paragraph
@@ -123,8 +122,7 @@ hard newline are considered to match.")
 ;; something very minimal, even including "." (which makes every hard newline
 ;; start a new paragraph).
 
-;; XEmacs -- use purecopy
-(defconst paragraph-separate (purecopy "[ \t\f]*$") "\
+(defconst paragraph-separate "[ \t\f]*$" "\
 *Regexp for beginning of a line that separates paragraphs.
 If you change this, you may have to change paragraph-start also.
 
@@ -133,8 +131,7 @@ the beginning of the line, so it should not use \"^\" as an anchor.  This
 ensures that the paragraph functions will work equally within a region of
 text indented by a margin setting.")
 
-;; XEmacs -- use purecopy
-(defconst sentence-end (purecopy "[.?!][]\"')}]*\\($\\| $\\|\t\\|  \\)[ \t\n]*") "\
+(defconst sentence-end "[.?!][]\"')}]*\\($\\| $\\|\t\\|  \\)[ \t\n]*" "\
 *Regexp describing the end of a sentence.
 All paragraph boundaries also end sentences, regardless.
 
@@ -142,8 +139,7 @@ In order to be recognized as the end of a sentence, the ending period,
 question mark, or exclamation point must be followed by two spaces,
 unless it's inside some sort of quotes or parenthesis.")
 
-;; XEmacs -- use purecopy
-(defconst page-delimiter (purecopy "^\014") "\
+(defconst page-delimiter "^\014" "\
 *Regexp describing line-beginnings that separate pages.")
 
 (defvar paragraph-ignore-fill-prefix nil "\
@@ -192,7 +188,7 @@ to which the end of the previous line belongs, or the end of the buffer."
 	  nil
 	(setq start (point))
 	;; Move back over paragraph-separating lines.
-	(forward-char -1) (beginning-of-line)
+	(backward-char 1) (beginning-of-line)
 	(while (and (not (bobp))
 		    (progn (move-to-left-margin)
 			   (looking-at paragraph-separate)))
@@ -339,7 +335,7 @@ negative arg -N means kill forward to Nth end of paragraph."
 (defun end-of-paragraph-text ()
   (let ((opoint (point)))
     (forward-paragraph 1)
-    (if (eq (char-before (point)) ?\n) (forward-char -1))
+    (if (eq (char-before (point)) ?\n) (backward-char 1))
     (if (<= (point) opoint)
 	(progn
 	  (forward-char 1)