Mercurial > emacs
diff lisp/textmodes/paragraphs.el @ 90070:95879cc1ed20
Revision: miles@gnu.org--gnu-2004/emacs--unicode--0--patch-81
Merge from emacs--cvs-trunk--0
Patches applied:
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-748
- miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-749
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-750
Merge from gnus--rel--5.10
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-751
- miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-753
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-754
Merge from gnus--rel--5.10
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-755
- miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-757
Update from CVS
* miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-78
Merge from emacs--cvs-trunk--0
* miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-79
- miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-80
Update from CVS
* miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-81
Merge from emacs--cvs-trunk--0
* miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-82
Update from CVS
| author | Miles Bader <miles@gnu.org> |
|---|---|
| date | Sun, 02 Jan 2005 09:13:19 +0000 |
| parents | fb79180b618d 4b5e5c2f1ee0 |
| children | f9a65d7ebd29 |
line wrap: on
line diff
--- a/lisp/textmodes/paragraphs.el Sat Dec 25 02:31:08 2004 +0000 +++ b/lisp/textmodes/paragraphs.el Sun Jan 02 09:13:19 2005 +0000 @@ -347,7 +347,7 @@ (or arg (setq arg 1)) (forward-paragraph (- arg))) -(defun mark-paragraph (&optional arg) +(defun mark-paragraph (&optional arg allow-extend) "Put point at beginning of this paragraph, mark at end. The paragraph marked is the one that contains point or follows point. @@ -357,15 +357,16 @@ If ARG is negative, point is put at end of this paragraph, mark is put at beginning of this or a previous paragraph. -If this command is repeated or mark is active in Transient Mark mode, -it marks the next ARG paragraphs after (or before, if arg is negative) -the ones already marked." - (interactive "p") +Interactively, if this command is repeated +or (in Transient Mark mode) if the mark is active, +it marks the next ARG paragraphs after the ones already marked." + (interactive "p\np") (unless arg (setq arg 1)) (when (zerop arg) (error "Cannot mark zero paragraphs")) - (cond ((or (and (eq last-command this-command) (mark t)) - (and transient-mark-mode mark-active)) + (cond ((and allow-extend + (or (and (eq last-command this-command) (mark t)) + (and transient-mark-mode mark-active))) (set-mark (save-excursion (goto-char (mark))