xemacs-beta: lisp/prim/paragraphs.el comparison

comparison lisp/prim/paragraphs.el @ 4:b82b59fe008d r19-15b3

Import from CVS: tag r19-15b3

author	cvs
date	Mon, 13 Aug 2007 08:46:56 +0200
parents	376386a54a3c
children	ec9a17fef872

comparison

equal deleted inserted replaced

-:30df88044ec6
+:b82b59fe008d
 ;;; paragraphs.el --- paragraph and sentence parsing.
-;; Copyright (C) 1985, 1986, 1987, 1991, 1993, 1994, 1995
+;; Copyright (C) 1985, 86, 87, 91, 94, 95 Free Software Foundation, Inc.
-;; Free Software Foundation, Inc.
 ;; Maintainer: FSF
 ;; Keywords: wp
 ;; This file is part of XEmacs.
 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 ;; General Public License for more details.
 ;; You should have received a copy of the GNU General Public License
 ;; along with XEmacs; see the file COPYING.  If not, write to the Free
-;; Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+;; Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+;; 02111-1307, USA.
-;;; Synched up with: FSF 19.30.
+;;; Synched up with: FSF 19.34.
 ;;; Commentary:
 ;; This package provides the paragraph-oriented commands documented in the
 ;; XEmacs Reference Manual.
 paragraphs.  The fill functions always insert soft newlines.
 Each buffer has its own value of this variable.")
 (make-variable-buffer-local 'use-hard-newlines)
+;; XEmacs - use purecopy
 (defconst paragraph-start (purecopy "[ \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
 \(and are part of that paragraph).
 ;; It is assumed that paragraph-separate is distinctive enough to be believed
 ;; whenever it occurs, while it is reasonable to set paragraph-start to
 ;; something very minimal, even including "." (which makes every hard newline
 ;; start a new paragraph).
+;; XEmacs -- use purecopy
 (defconst paragraph-separate (purecopy "[ \t\f]*$") "\
 *Regexp for beginning of a line that separates paragraphs.
 If you change this, you may have to change paragraph-start also.
 This is matched against the text at the left margin, which is not necessarily
 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]*") "\
 *Regexp describing the end of a sentence.
 All paragraph boundaries also end sentences, regardless.
 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") "\
 *Regexp describing line-beginnings that separate pages.")
 (defvar paragraph-ignore-fill-prefix nil "\
 Non-nil means the paragraph commands are not affected by `fill-prefix'.
 A line which `paragraph-start' matches either separates paragraphs
 \(if `paragraph-separate' matches it also) or is the first line of a paragraph.
 A paragraph end is the beginning of a line which is not part of the paragraph
 to which the end of the previous line belongs, or the end of the buffer."
-(interactive "_p")
+(interactive "_p") ; XEmacs
 (or arg (setq arg 1))
 (let* ((fill-prefix-regexp
 	  (and fill-prefix (not (equal fill-prefix ""))
 	       (not paragraph-ignore-fill-prefix)
 	       (regexp-quote fill-prefix)))
 		    (progn (move-to-left-margin)
 			   (looking-at paragraph-separate)))
 	  (forward-line -1))
 	(if (bobp)
 	    nil
-(progn
+	  ;; Go to end of the previous (non-separating) line.
-;; Go to end of the previous (non-separating) line.
+	  (end-of-line)
-(end-of-line)
+	  ;; Search back for line that starts or separates paragraphs.
-;; Search back for line that starts or separates paragraphs.
+	  (if (if fill-prefix-regexp
-(if (if fill-prefix-regexp
+		  ;; There is a fill prefix; it overrides paragraph-start.
-;; There is a fill prefix; it overrides paragraph-start.
 		  (let (multiple-lines)
 		    (while (and (progn (beginning-of-line) (not (bobp)))
 				(progn (move-to-left-margin)
 				       (not (looking-at paragraph-separate)))
 				(looking-at fill-prefix-regexp))
 				(and use-hard-newlines
 				     (not (get-text-property (1- start)
 							     'hard)))))
 		  (goto-char start))
 		(> (point) (point-min)))
-;; Found one.
+	      ;; Found one.
-(progn
+	      (progn
-;; Move forward over paragraph separators.
+		;; Move forward over paragraph separators.
-;; We know this cannot reach the place we started
+		;; We know this cannot reach the place we started
-;; because we know we moved back over a non-separator.
+		;; because we know we moved back over a non-separator.
 		(while (and (not (eobp))
 			    (progn (move-to-left-margin)
 				   (looking-at paragraph-separate)))
-(forward-line 1))
+		  (forward-line 1))
 		;; If line before paragraph is just margin, back up to there.
 		(end-of-line 0)
 		(if (> (current-column) (current-left-margin))
 		    (forward-char 1)
 		  (skip-chars-backward " \t")
 		  (if (not (bolp))
 		      (forward-line 1))))
-;; No starter or separator line => use buffer beg.
+	    ;; No starter or separator line => use buffer beg.
-(goto-char (point-min))))))
+	    (goto-char (point-min)))))
 (setq arg (1+ arg)))
 (while (and (> arg 0) (not (eobp)))
+;; Move forward over separator lines, and one more line.
 (while (prog1 (and (not (eobp))
 			 (progn (move-to-left-margin) (not (eobp)))
 			 (looking-at paragraph-separate))
 	       (forward-line 1)))
 (if fill-prefix-regexp
 paragraph-separating line; except: if the first real line of a
 paragraph is preceded by a blank line, the paragraph starts at that
 blank line.
 See `forward-paragraph' for more information."
-(interactive "_p")
+(interactive "_p") ; XEmacs
 (or arg (setq arg 1))
 (forward-paragraph (- arg)))
 (defun mark-paragraph ()
 "Put point at beginning of this paragraph, mark at end.
 (defun kill-paragraph (arg)
 "Kill forward to end of paragraph.
 With arg N, kill forward to Nth end of paragraph;
 negative arg -N means kill backward to Nth start of paragraph."
-(interactive "*p")
+(interactive "*p") ; XEmacs
 (kill-region (point) (progn (forward-paragraph arg) (point))))
 (defun backward-kill-paragraph (arg)
 "Kill back to start of paragraph.
 With arg N, kill back to Nth start of paragraph;
 negative arg -N means kill forward to Nth end of paragraph."
-(interactive "*p")
+(interactive "*p") ; XEmacs
 (kill-region (point) (progn (backward-paragraph arg) (point))))
 (defun transpose-paragraphs (arg)
 "Interchange this (or next) paragraph with previous one."
 (interactive "*p")
 (defun forward-sentence (&optional arg)
 "Move forward to next `sentence-end'.  With argument, repeat.
 With negative argument, move backward repeatedly to `sentence-beginning'.
-The variable `sentence-end' is a regular expression that matches ends
+The variable `sentence-end' is a regular expression that matches ends of
-of sentences.  Also, every paragraph boundary terminates sentences as
+sentences.  Also, every paragraph boundary terminates sentences as well."
-well."
+(interactive "_p") ; XEmacs
-(interactive "_p")
 (or arg (setq arg 1))
 (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)))
 (setq arg (1- arg))))
 (defun backward-sentence (&optional arg)
 "Move backward to start of sentence.  With arg, do it arg times.
 See `forward-sentence' for more information."
-(interactive "_p")
+(interactive "_p") ; XEmacs
 (or arg (setq arg 1))
 (forward-sentence (- arg)))
 (defun kill-sentence (&optional arg)
 "Kill from point to end of sentence.
 With arg, repeat; negative arg -N means kill back to Nth start of sentence."
-(interactive "p")
+(interactive "*p") ; XEmacs
 (kill-region (point) (progn (forward-sentence arg) (point))))
 (defun backward-kill-sentence (&optional arg)
 "Kill back from point to start of sentence.
 With arg, repeat, or kill forward to Nth end of sentence if negative arg -N."
-(interactive "p")
+(interactive "*p") ; XEmacs
 (kill-region (point) (progn (backward-sentence arg) (point))))
 (defun mark-end-of-sentence (arg)
 "Put mark at end of sentence.  Arg works as in `forward-sentence'."
 (interactive "p")
+;; FSF Version:
+;  (push-mark
+;   (save-excursion
+;     (forward-sentence arg)
+;     (point))
+;   nil t))
 (mark-something 'mark-end-of-sentence 'forward-sentence arg))
 (defun transpose-sentences (arg)
 "Interchange this (next) and previous sentence."
 (interactive "*p")
 (transpose-subr 'forward-sentence arg))
 ;;; paragraphs.el ends here

Mercurial > hg > xemacs-beta

comparison lisp/prim/paragraphs.el @ 4:b82b59fe008d r19-15b3