branch: elpa/isl
commit 74be02eef096314cb11c2b93dfa16e957e1650ed
Author: Thierry Volpiatto <[email protected]>
Commit: Thierry Volpiatto <[email protected]>
Don't break invalid regexp message in mode-line with
unneeded condition-case; Set invalid-regexp as well in multi search.
---
isl.el | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/isl.el b/isl.el
index 13fafc17a81..4a74c354cf7 100644
--- a/isl.el
+++ b/isl.el
@@ -682,9 +682,7 @@ symbol or line position according to
`isl-multi-search-in-line'."
(initial (or (assq 'identity pattern)
'(identity . "")))
(rest (cdr pattern)))
- (cl-loop while (condition-case _err
- (funcall isl-search-function (cdr initial) nil t)
- (invalid-regexp nil))
+ (cl-loop while (funcall isl-search-function (cdr initial) nil t)
for bounds = (cond ((and rest isl-multi-search-in-line)
(cons (point-at-bol) (point-at-eol)))
(rest
@@ -701,7 +699,8 @@ symbol or line position according to
`isl-multi-search-in-line'."
(condition-case _err
(funcall isl-search-function
re (cdr bounds) t)
- (invalid-regexp nil))))))
+ (invalid-regexp
+ (setq isl--invalid t)
nil))))))
do (goto-char (cdr bounds)) and return bounds
else do (goto-char (cdr bounds))
finally return nil)))
