procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

* lisp/isearch.el (isearch-abort): Don't quit if search has

Browse source 
an incomplete regexp (isearch-error is non-nil).  (Bug#7534)
This commit is contained in:
Juri Linkov 2011-01-16 01:04:22 +00:00
parent dc3e3e7b22
commit d4119912fb
2 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
lisp/ChangeLog
View file

@ -1,3 +1,8 @@
2011-01-16 Juri Linkov <juri@jurta.org>
* isearch.el (isearch-abort): Don't quit if search has
an incomplete regexp (isearch-error is non-nil). (Bug#7534)
2011-01-15 Mark Diekhans <markd@soe.ucsc.edu>
* files.el (backup-buffer): Make last-resort backup file in

6
lisp/isearch.el
View file

@ -1244,9 +1244,9 @@ Use `isearch-exit' to quit without signaling."
(interactive)
;; (ding) signal instead below, if quitting
(discard-input)
(if isearch-success
;; If search is successful, move back to starting point
;; and really do quit.
(if (and isearch-success (not isearch-error))
;; If search is successful and has no incomplete regexp,
;; move back to starting point and really do quit.
(progn
(setq isearch-success nil)
(isearch-cancel))