mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2024-11-23 07:19:15 +00:00
Code Issues Releases Activity

(isearch-repeat): With empty search ring set `isearch-error' to the

Browse Source 
error string instead of signaling error with the function `error'.
This commit is contained in:
Juri Linkov 2005-11-24 09:59:37 +00:00
parent b9c7cbf926
commit ece75c05d6
2 changed files with 16 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lisp/ChangeLog
View File

@ -1,3 +1,9 @@
2005-11-24 Juri Linkov <juri@jurta.org>
* isearch.el (isearch-repeat): With empty search ring
set `isearch-error' to the error string instead of signaling
error with the function `error'.
2005-11-24 YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
* term/mac-win.el: Make modifier `ctrl' an alias of `control'.

19
lisp/isearch.el
View File

@ -1138,15 +1138,16 @@ Use `isearch-exit' to quit without signaling."
;; C-s in forward or C-r in reverse.
(if (equal isearch-string "")
;; If search string is empty, use last one.
(setq isearch-string
(or (if isearch-regexp
(car regexp-search-ring)
(car search-ring))
(error "No previous search string"))
isearch-message
(mapconcat 'isearch-text-char-description
isearch-string "")
isearch-case-fold-search isearch-last-case-fold-search)
(if (null (if isearch-regexp regexp-search-ring search-ring))
(setq isearch-error "No previous search string")
(setq isearch-string
(if isearch-regexp
(car regexp-search-ring)
(car search-ring))
isearch-message
(mapconcat 'isearch-text-char-description
isearch-string "")
isearch-case-fold-search isearch-last-case-fold-search))
;; If already have what to search for, repeat it.
(or isearch-success
(progn