Commit 121f8c95 authored by Juri Linkov's avatar Juri Linkov

* lisp/isearch.el (isearch-search): Change regexp error message for non-regexp searches.

Fixes: debbugs:15166
parent 5ab473cd
2013-08-28 Juri Linkov <juri@jurta.org>
* isearch.el (isearch-search): Change regexp error message for
non-regexp searches. (Bug#15166)
2013-08-28 Paul Eggert <eggert@cs.ucla.edu> 2013-08-28 Paul Eggert <eggert@cs.ucla.edu>
* Makefile.in (SHELL): Now @SHELL@, not /bin/sh, * Makefile.in (SHELL): Now @SHELL@, not /bin/sh,
......
...@@ -2784,10 +2784,18 @@ update the match data, and return point." ...@@ -2784,10 +2784,18 @@ update the match data, and return point."
(invalid-regexp (invalid-regexp
(setq isearch-error (car (cdr lossage))) (setq isearch-error (car (cdr lossage)))
(if (string-match (cond
"\\`Premature \\|\\`Unmatched \\|\\`Invalid " ((string-match
isearch-error) "\\`Premature \\|\\`Unmatched \\|\\`Invalid "
(setq isearch-error "incomplete input"))) isearch-error)
(setq isearch-error "incomplete input"))
((and (not isearch-regexp)
(string-match "\\`Regular expression too big" isearch-error))
(cond
(isearch-word
(setq isearch-error "Too many words"))
((and isearch-lax-whitespace search-whitespace-regexp)
(setq isearch-error "Too many spaces for whitespace matching"))))))
(search-failed (search-failed
(setq isearch-success nil) (setq isearch-success nil)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment