[Emacs-diffs] trunk r114045: * lisp/isearch.el (isearch-search): Change regexp error message for non-regexp searches.

[Juri Linkov]

------------------------------------------------------------
revno: 114045
revision-id: address@hidden
parent: address@hidden
fixes bug: http://debbugs.gnu.org/15166
committer: Juri Linkov <address@hidden>
branch nick: trunk
timestamp: Wed 2013-08-28 19:33:02 +0300
message:
  * lisp/isearch.el (isearch-search): Change regexp error message for 
non-regexp searches.
modified:
  lisp/ChangeLog                 changelog-20091113204419-o5vbwnq5f7feedwu-1432
  lisp/isearch.el                isearch.el-20091113204419-o5vbwnq5f7feedwu-486

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2013-08-28 06:01:52 +0000
+++ b/lisp/ChangeLog    2013-08-28 16:33:02 +0000
@@ -1,3 +1,8 @@
+2013-08-28  Juri Linkov  <address@hidden>
+
+       * isearch.el (isearch-search): Change regexp error message for
+       non-regexp searches.  (Bug#15166)
+
 2013-08-28  Paul Eggert  <address@hidden>
 
        * Makefile.in (SHELL): Now @SHELL@, not /bin/sh,

=== modified file 'lisp/isearch.el'
--- a/lisp/isearch.el   2013-08-27 16:06:16 +0000
+++ b/lisp/isearch.el   2013-08-28 16:33:02 +0000
@@ -2784,10 +2784,18 @@
 
     (invalid-regexp
      (setq isearch-error (car (cdr lossage)))
-     (if (string-match
-         "\\`Premature \\|\\`Unmatched \\|\\`Invalid "
-         isearch-error)
-        (setq isearch-error "incomplete input")))
+     (cond
+      ((string-match
+       "\\`Premature \\|\\`Unmatched \\|\\`Invalid "
+       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
      (setq isearch-success nil)