Mercurial > emacs
changeset 43301:898b4b31410f
* lisp/simple.el (mark-word): Mark more if repeated.
* lisp/textmodes/paragraphs.el (mark-paragraph): Ditto.
(mark-end-of-sentence): Ditto.
| author | Kai Großjohann <kgrossjo@eu.uu.net> |
|---|---|
| date | Fri, 15 Feb 2002 08:53:15 +0000 |
| parents | 893c39e49ae7 |
| children | 2f479ac769e1 |
| files | etc/NEWS lisp/ChangeLog lisp/emacs-lisp/lisp.el lisp/simple.el lisp/textmodes/paragraphs.el man/mark.texi |
| diffstat | 6 files changed, 93 insertions(+), 43 deletions(-) [+] |
line wrap: on
line diff
--- a/etc/NEWS Fri Feb 15 08:06:36 2002 +0000 +++ b/etc/NEWS Fri Feb 15 08:53:15 2002 +0000 @@ -245,9 +245,13 @@ example, if you set `jit-lock-defer-time' to 0.25, fontification will only happen after 0.25s of idle time. -** If you hit M-C-SPC (mark-sexp) repeatedly, the marked region -will now be extended each time, so you can mark the next two sexps with -M-C-SPC M-C-SPC, for example. ++++ +** Marking commands extend the region when invoked multiple times. If +you hit M-C-SPC (mark-sexp), M-@ (mark-word), M-h (mark-paragraph), or +C-M-h (mark-defun) repeatedly, the marked region will now be extended +each time, so you can mark the next two sexps with M-C-SPC M-C-SPC, +for example. This feature also works for mark-end-of-sentence, if you +bind that to a key. ** In the *Occur* buffer, `o' switches to it in another window, and C-o displays the current line's occurrence in another window without
--- a/lisp/ChangeLog Fri Feb 15 08:06:36 2002 +0000 +++ b/lisp/ChangeLog Fri Feb 15 08:53:15 2002 +0000 @@ -1,3 +1,9 @@ +2002-02-15 Kai Gro,A_(Bjohann <Kai.Grossjohann@CS.Uni-Dortmund.DE> + + * simple.el (mark-word): Mark more if repeated. + * textmodes/paragraphs.el (mark-paragraph): Ditto. + (mark-end-of-sentence): Ditto. + 2002-02-15 Per Abrahamsen <abraham@dina.kvl.dk> * wid-edit.el (widgetp): Made it more robust.
--- a/lisp/emacs-lisp/lisp.el Fri Feb 15 08:06:36 2002 +0000 +++ b/lisp/emacs-lisp/lisp.el Fri Feb 15 08:53:15 2002 +0000 @@ -76,13 +76,18 @@ If this command is repeated, it marks the next ARG sexps after the ones already marked." (interactive "p") - (push-mark - (save-excursion - (if (and (eq last-command this-command) (mark t)) - (goto-char (mark))) - (forward-sexp (or arg 1)) - (point)) - nil t)) + (cond ((and (eq last-command this-command) (mark t)) + (set-mark + (save-excursion + (goto-char (mark)) + (forward-sexp (or arg 1)) + (point)))) + (t + (push-mark + (save-excursion + (forward-sexp (or arg 1)) + (point)) + nil t)))) (defun forward-list (&optional arg) "Move forward across one balanced group of parentheses. @@ -250,13 +255,21 @@ (defun mark-defun () "Put mark at end of this defun, point at beginning. -The defun marked is the one that contains point or follows point." +The defun marked is the one that contains point or follows point. +If this command is repeated, marks more defuns after the ones +already marked." (interactive) - (push-mark (point)) - (end-of-defun) - (push-mark (point) nil t) - (beginning-of-defun) - (re-search-backward "^\n" (- (point) 1) t)) + (let (here) + (when (and (eq last-command this-command) (mark t)) + (setq here (point)) + (goto-char (mark))) + (push-mark (point)) + (end-of-defun) + (push-mark (point) nil t) + (if here + (goto-char here) + (beginning-of-defun) + (re-search-backward "^\n" (- (point) 1) t)))) (defun narrow-to-defun (&optional arg) "Make text outside current defun invisible.
--- a/lisp/simple.el Fri Feb 15 08:06:36 2002 +0000 +++ b/lisp/simple.el Fri Feb 15 08:53:15 2002 +0000 @@ -2812,13 +2812,22 @@ (forward-word (- arg))) (defun mark-word (arg) - "Set mark arg words away from point." + "Set mark arg words away from point. +If this command is repeated, it marks the next ARG words after the ones +already marked." (interactive "p") - (push-mark - (save-excursion - (forward-word arg) - (point)) - nil t)) + (cond ((and (eq last-command this-command) (mark t)) + (set-mark + (save-excursion + (goto-char (mark)) + (forward-word arg) + (point)))) + (t + (push-mark + (save-excursion + (forward-word arg) + (point)) + nil t)))) (defun kill-word (arg) "Kill characters forward until encountering the end of a word.
--- a/lisp/textmodes/paragraphs.el Fri Feb 15 08:06:36 2002 +0000 +++ b/lisp/textmodes/paragraphs.el Fri Feb 15 08:53:15 2002 +0000 @@ -325,14 +325,23 @@ the number of paragraphs marked equals ARG. If ARG is negative, point is put at end of this paragraph, mark is put -at beginning of this or a previous paragraph." +at beginning of this or a previous paragraph. + +If this command is repeated, it marks the next ARG paragraphs after (or +before, if arg is negative) the ones already marked." (interactive "p") - (unless arg (setq arg 1)) - (when (zerop arg) - (error "Cannot mark zero paragraphs")) - (forward-paragraph arg) - (push-mark nil t t) - (backward-paragraph arg)) + (let (here) + (unless arg (setq arg 1)) + (when (zerop arg) + (error "Cannot mark zero paragraphs")) + (when (and (eq last-command this-command) (mark t)) + (setq here (point)) + (goto-char (mark))) + (forward-paragraph arg) + (push-mark nil t t) + (if here + (goto-char here) + (backward-paragraph arg)))) (defun kill-paragraph (arg) "Kill forward to end of paragraph. @@ -424,13 +433,17 @@ (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'." + "Put mark at end of sentence. Arg works as in `forward-sentence'. +If this command is repeated, it marks the next ARG sentences after the +ones already marked." (interactive "p") (push-mark - (save-excursion - (forward-sentence arg) - (point)) - nil t)) + (save-excursion + (if (and (eq last-command this-command) (mark t)) + (goto-char (mark))) + (forward-sentence arg) + (point)) + nil t)) (defun transpose-sentences (arg) "Interchange this (next) and previous sentence."
--- a/man/mark.texi Fri Feb 15 08:06:36 2002 +0000 +++ b/man/mark.texi Fri Feb 15 08:53:15 2002 +0000 @@ -278,7 +278,9 @@ @kbd{M-@@} (@code{mark-word}) puts the mark at the end of the next word, while @kbd{C-M-@@} (@code{mark-sexp}) puts it at the end of the next balanced expression (@pxref{Expressions}). These commands handle -arguments just like @kbd{M-f} and @kbd{C-M-f}. +arguments just like @kbd{M-f} and @kbd{C-M-f}. If you repeat these +commands, the region is extended. For example, you can type either +@kbd{C-u 2 M-@@} or @kbd{M-@@ M-@@} to mark the next two words. @kindex C-x h @findex mark-whole-buffer @@ -292,17 +294,20 @@ point. If the prefix argument is @minus{}@var{n}, @kbd{M-h} also marks @var{n} paragraphs, running back form the one surrounding point. In that last case, point moves forward to the end of that paragraph, -and the mark goes at the start of the region. +and the mark goes at the start of the region. The @kbd{M-h} command +also supports the extension of the region, similar to @kbd{M-@@} and +@kbd{C-M-@@}. @kbd{C-M-h} (@code{mark-defun}) similarly puts point before, and the mark after, the current (or following) major top-level definition, or -defun (@pxref{Moving by Defuns}). (Currently it only marks one -defun.) @kbd{C-x C-p} (@code{mark-page}) puts point before the -current page, and mark at the end (@pxref{Pages}). The mark goes -after the terminating page delimiter (to include it in the region), -while point goes after the preceding page delimiter (to exclude it). -A numeric argument specifies a later page (if positive) or an earlier -page (if negative) instead of the current page. +defun (@pxref{Moving by Defuns}). (Currently it only marks one defun, +but repeating it marks more defuns, like for @kbd{M-@@}.) @kbd{C-x +C-p} (@code{mark-page}) puts point before the current page, and mark +at the end (@pxref{Pages}). The mark goes after the terminating page +delimiter (to include it in the region), while point goes after the +preceding page delimiter (to exclude it). A numeric argument +specifies a later page (if positive) or an earlier page (if negative) +instead of the current page. Finally, @kbd{C-x h} (@code{mark-whole-buffer}) sets up the entire buffer as the region, by putting point at the beginning and the mark at