[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] /srv/bzr/emacs/trunk r103564: Bind C-y in Isearch to isear
From: |
Chong Yidong |
Subject: |
[Emacs-diffs] /srv/bzr/emacs/trunk r103564: Bind C-y in Isearch to isearch-yank-kill. |
Date: |
Sun, 06 Mar 2011 13:24:11 -0500 |
User-agent: |
Bazaar (2.0.3) |
------------------------------------------------------------
revno: 103564
committer: Chong Yidong <address@hidden>
branch nick: trunk
timestamp: Sun 2011-03-06 13:24:11 -0500
message:
Bind C-y in Isearch to isearch-yank-kill.
* lisp/isearch.el (isearch-mode-map): Bind C-y to isearch-yank-kill,
and move isearch-yank-line to M-s C-e.
* doc/emacs/search.texi (Isearch Yank): C-y now bound to isearch-yank-kill.
modified:
doc/emacs/ChangeLog
doc/emacs/search.texi
etc/NEWS
lisp/ChangeLog
lisp/isearch.el
=== modified file 'doc/emacs/ChangeLog'
--- a/doc/emacs/ChangeLog 2011-03-03 07:00:23 +0000
+++ b/doc/emacs/ChangeLog 2011-03-06 18:24:11 +0000
@@ -1,3 +1,7 @@
+2011-03-06 Chong Yidong <address@hidden>
+
+ * search.texi (Isearch Yank): C-y now bound to isearch-yank-kill.
+
2011-03-03 Drake Wilson <address@hidden> (tiny change)
* misc.texi (emacsclient Options): Add q/quiet.
=== modified file 'doc/emacs/search.texi'
--- a/doc/emacs/search.texi 2011-02-28 01:07:29 +0000
+++ b/doc/emacs/search.texi 2011-03-06 18:24:11 +0000
@@ -271,19 +271,24 @@
@node Isearch Yank
@subsection Isearch Yanking
- Within incremental search, you can use @kbd{C-w} and @kbd{C-y} to grab
-text from the buffer into the search string. This makes it convenient
-to search for another occurrence of text at point.
-
- @kbd{C-w} copies the character or word after point and adds it to
-the search string, advancing point over it. (The decision, whether to
-copy a character or a word, is heuristic.)
-
- @kbd{C-y} is similar to @kbd{C-w} but copies all the rest of the
-current line into the search string. If point is already at the end
-of a line, it grabs the entire next line. If the search is currently
-case-insensitive, both @kbd{C-y} and @kbd{C-w} convert the text they
-copy to lower case, so that the search remains case-insensitive.
+ Within incremental search, @kbd{C-y} (@code{isearch-yank-kill})
+copies text from the kill ring into the search string. It uses the
+same text that @kbd{C-y}, outside of incremental search, would
+normally yank into the buffer. @kbd{Mouse-2} in the echo area does
+the same. @xref{Yanking}.
+
+ @kbd{C-w} (@code{isearch-yank-word-or-char}) grabs the next
+character or word at point, and adds it to the search string. This is
+convenient for searching for another occurrence of the text at point.
+(The decision, whether to copy a character or a word, is heuristic.)
+
+ Similarly, @kbd{M-s C-e} (@code{isearch-yank-line}) grabs the rest
+of the current line, and adds it to the search string. If point is
+already at the end of a line, it grabs the entire next line.
+
+ If the search is currently case-insensitive, both @kbd{C-w} and
address@hidden C-e} convert the text they copy to lower case, so that the
+search remains case-insensitive.
@kbd{C-M-w} and @kbd{C-M-y} modify the search string by only one
character at a time: @kbd{C-M-w} deletes the last character from the
@@ -293,10 +298,6 @@
@kbd{M-e} and to type @kbd{C-f} at the end of the search string in the
minibuffer.
- The character @kbd{M-y} copies text from the kill ring into the
-search string. It uses the same text that @kbd{C-y} would yank.
address@hidden in the echo area does the same. @xref{Yanking}.
-
@node Isearch Scroll
@subsection Scrolling During Incremental Search
=== modified file 'etc/NEWS'
--- a/etc/NEWS 2011-03-06 03:01:23 +0000
+++ b/etc/NEWS 2011-03-06 18:24:11 +0000
@@ -247,6 +247,15 @@
* Editing Changes in Emacs 24.1
+** Search changes
+
++++
+*** C-y in Isearch is now bound to isearch-yank-kill, instead of
+isearch-yank-line.
+
++++
+*** M-s C-e in Isearch is now bound to isearch-yank-line.
+
+++
** There is a new command `count-words-region', which does what you expect.
=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog 2011-03-06 17:03:45 +0000
+++ b/lisp/ChangeLog 2011-03-06 18:24:11 +0000
@@ -1,3 +1,8 @@
+2011-03-06 Chong Yidong <address@hidden>
+
+ * isearch.el (isearch-mode-map): Bind C-y to isearch-yank-kill,
+ and move isearch-yank-line to M-s C-e (Bug#8183).
+
2011-03-06 Alan Mackenzie <address@hidden>
* progmodes/cc-engine.el (c-guess-basic-syntax): Reindent.
=== modified file 'lisp/isearch.el'
--- a/lisp/isearch.el 2011-01-26 08:36:39 +0000
+++ b/lisp/isearch.el 2011-03-06 18:24:11 +0000
@@ -464,7 +464,8 @@
(define-key map "\C-w" 'isearch-yank-word-or-char)
(define-key map "\M-\C-w" 'isearch-del-char)
(define-key map "\M-\C-y" 'isearch-yank-char)
- (define-key map "\C-y" 'isearch-yank-line)
+ (define-key map "\C-y" 'isearch-yank-kill)
+ (define-key map "\M-s\C-e" 'isearch-yank-line)
(define-key map (char-to-string help-char) isearch-help-map)
(define-key map [help] isearch-help-map)
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] /srv/bzr/emacs/trunk r103564: Bind C-y in Isearch to isearch-yank-kill.,
Chong Yidong <=