diff options
| author | Juri Linkov | 2010-05-21 00:49:49 +0300 |
|---|---|---|
| committer | Juri Linkov | 2010-05-21 00:49:49 +0300 |
| commit | 5d944a8f7fa14eadecd9375ee88881036c1aea26 (patch) | |
| tree | 10139df1b0ffb1cd26da0e416f0c3d40561dd204 | |
| parent | 2ee13033a8a600e53b86004fad293c8819412131 (diff) | |
| download | emacs-5d944a8f7fa14eadecd9375ee88881036c1aea26.tar.gz emacs-5d944a8f7fa14eadecd9375ee88881036c1aea26.zip | |
* isearch.el (isearch-yank-string): Use isearch-process-search-string.
(Bug#6223)
| -rw-r--r-- | lisp/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/isearch.el | 12 |
2 files changed, 9 insertions, 8 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index b54d50d79fa..8ba93b3cebb 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,5 +1,10 @@ | |||
| 1 | 2010-05-20 Juri Linkov <juri@jurta.org> | 1 | 2010-05-20 Juri Linkov <juri@jurta.org> |
| 2 | 2 | ||
| 3 | * isearch.el (isearch-yank-string): Use isearch-process-search-string. | ||
| 4 | (Bug#6223) | ||
| 5 | |||
| 6 | 2010-05-20 Juri Linkov <juri@jurta.org> | ||
| 7 | |||
| 3 | * dired-x.el (dired-jump, dired-jump-other-window): Add arg | 8 | * dired-x.el (dired-jump, dired-jump-other-window): Add arg |
| 4 | FILE-NAME to read from the minibuffer when called interactively | 9 | FILE-NAME to read from the minibuffer when called interactively |
| 5 | with prefix argument instead of using buffer-file-name. | 10 | with prefix argument instead of using buffer-file-name. |
diff --git a/lisp/isearch.el b/lisp/isearch.el index 64cb66bdab5..22b20a4c4a9 100644 --- a/lisp/isearch.el +++ b/lisp/isearch.el | |||
| @@ -1476,14 +1476,10 @@ If search string is empty, just beep." | |||
| 1476 | (eq 'not-yanks search-upper-case)) | 1476 | (eq 'not-yanks search-upper-case)) |
| 1477 | (setq string (downcase string))) | 1477 | (setq string (downcase string))) |
| 1478 | (if isearch-regexp (setq string (regexp-quote string))) | 1478 | (if isearch-regexp (setq string (regexp-quote string))) |
| 1479 | (setq isearch-string (concat isearch-string string) | 1479 | ;; Don't move cursor in reverse search. |
| 1480 | isearch-message | 1480 | (setq isearch-yank-flag t) |
| 1481 | (concat isearch-message | 1481 | (isearch-process-search-string |
| 1482 | (mapconcat 'isearch-text-char-description | 1482 | string (mapconcat 'isearch-text-char-description string ""))) |
| 1483 | string "")) | ||
| 1484 | ;; Don't move cursor in reverse search. | ||
| 1485 | isearch-yank-flag t) | ||
| 1486 | (isearch-search-and-update)) | ||
| 1487 | 1483 | ||
| 1488 | (defun isearch-yank-kill () | 1484 | (defun isearch-yank-kill () |
| 1489 | "Pull string from kill ring into search string." | 1485 | "Pull string from kill ring into search string." |