[Top][All Lists]

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

bug#6106: 24.0.50; info.el adds 'search-failed to debug-ignored-errors

From: npostavs
Subject: bug#6106: 24.0.50; info.el adds 'search-failed to debug-ignored-errors
Date: Sat, 01 Apr 2017 09:43:59 -0400
User-agent: Gnus/5.13 (Gnus v5.13) Emacs/25.2 (gnu/linux)

address@hidden writes:

> (Info-select-node, Info-search): Replace (signal 'search-failed ...)
> with (user-error "Search failed: "...).

Turns out this breaks isearch over multiple nodes, as noted by Mark
Oteiza in [1].  I believe this is fixed by the patch below.

[1]: http://lists.gnu.org/archive/html/emacs-devel/2017-03/msg00869.html

>From 2cb893febdf06282c1183b3e4f4de8728bbe44b9 Mon Sep 17 00:00:00 2001
From: Noam Postavsky <address@hidden>
Date: Sat, 1 Apr 2017 09:34:04 -0400
Subject: [PATCH v1] Throw a `search-failed' derived error in Info search

The original fix for Bug#6106 switched from signalling `search-failed'
to `user-error'.  However, this breaks incremental searching over
multiple nodes because the isearch code doesn't expect a `user-error'.

* src/search.c (syms_of_search): New error, `user-search-failed',
with `user-error' and `search-failed' as parents.
* lisp/info.el (Info-search): Use it instead of `user-error' so that
isearch will handle failed searches correctly.
 lisp/info.el | 12 ++++++------
 src/search.c |  9 +++++++++
 2 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/lisp/info.el b/lisp/info.el
index a6bab290a7..81e5d29f82 100644
--- a/lisp/info.el
+++ b/lisp/info.el
@@ -1998,20 +1998,20 @@ Info-search
                   (and found (> found opoint-min) (< found opoint-max)))
-       (user-error "Search failed: `%s' (end of node)" regexp))
+       (signal 'user-search-failed (list regexp "(end of node)")))
       ;; If no subfiles, give error now.
       (unless (or found Info-current-subfile)
         (if isearch-mode
-            (user-error "Search failed: `%s' (end of manual)" regexp)
+            (signal 'user-search-failed (list regexp "end of manual"))
           (let ((search-spaces-regexp Info-search-whitespace-regexp))
             (unless (if backward
                         (re-search-backward regexp nil t)
                       (re-search-forward regexp nil t))
-              (user-error "Search failed: `%s'" regexp)))))
+              (signal 'user-seach-failed (list regexp))))))
       (if (and bound (not found))
-          (user-error "Search failed: `%s'" regexp))
+          (signal 'user-search-failed (list regexp)))
       (unless (or found bound)
@@ -2055,8 +2055,8 @@ Info-search
                    (setq list nil)))
              (if found
                  (message "")
-                (user-error "Search failed: `%s'%s"
-                            regexp (if isearch-mode " (end of manual)" ""))))
+                (signal 'user-search-failed
+                        `(,regexp ,@(if isearch-mode '("end of manual"))))))
          (if (not found)
              (progn (Info-read-subfile osubfile)
                     (goto-char opoint)
diff --git a/src/search.c b/src/search.c
index 33cb02aa7a..48caea2f51 100644
--- a/src/search.c
+++ b/src/search.c
@@ -3389,6 +3389,10 @@ syms_of_search (void)
   /* Error condition used for failing searches.  */
   DEFSYM (Qsearch_failed, "search-failed");
+  /* Error condition used for failing searches started by user, i.e.,
+     where failure should not invoke the debugger.  */
+  DEFSYM (Quser_search_failed, "search-failed");
   /* Error condition signaled when regexp compile_pattern fails.  */
   DEFSYM (Qinvalid_regexp, "invalid-regexp");
@@ -3397,6 +3401,11 @@ syms_of_search (void)
   Fput (Qsearch_failed, Qerror_message,
        build_pure_c_string ("Search failed"));
+  Fput (Quser_search_failed, Qerror_conditions,
+       listn (CONSTYPE_PURE, 2, Qsearch_failed, Quser_error));
+  Fput (Quser_search_failed, Qerror_message,
+       build_pure_c_string ("Search failed"));
   Fput (Qinvalid_regexp, Qerror_conditions,
        listn (CONSTYPE_PURE, 2, Qinvalid_regexp, Qerror));
   Fput (Qinvalid_regexp, Qerror_message,

reply via email to

[Prev in Thread] Current Thread [Next in Thread]