@@ -302,7 +302,7 @@ If the input is empty, select the previous history element instead."
302
302
(cl-sort visible-overlays #'< :key #'overlay-start )))
303
303
(min-overlay-start 0 )
304
304
(overlays-for-avy
305
- (cl-remove -if-not
305
+ (cl-delete -if-not
306
306
(lambda (ov )
307
307
(when (and (>= (overlay-start ov)
308
308
min-overlay-start)
@@ -781,7 +781,7 @@ Add a space after a leading `^' for `swiper', and apply
781
781
This is the regex used in the minibuffer where candidates have
782
782
line numbers. For the buffer, use `ivy--regex' instead."
783
783
(let* ((re-builder (ivy-alist-setting ivy-re-builders-alist))
784
- (str (replace-regexp-in- string " \\ \\ n" " \n " str))
784
+ (str (ivy-- string-replace " \\ n" " \n " str))
785
785
(re (funcall re-builder str)))
786
786
(if (consp re)
787
787
(mapcar
@@ -948,24 +948,17 @@ the face, window and priority of the overlay."
948
948
(or (display-graphic-p )
949
949
(not recenter-redisplay)))
950
950
951
- (defun swiper--positive-regexps ()
952
- (if (listp ivy-regex)
953
- (mapcar #'car (cl-remove-if-not #'cdr ivy-regex))
954
- (list ivy-regex)))
955
-
956
951
(defun swiper--update-input-ivy ()
957
952
" Called when `ivy' input is updated."
958
953
(with-ivy-window
959
954
(swiper--cleanup)
960
955
(when (> (length (ivy-state-current ivy-last)) 0 )
961
- (let ((regexps (swiper --positive-regexps))
956
+ (let ((regexps (ivy --positive-regexps))
962
957
(re-idx -1 )
963
958
(case-fold-search (ivy--case-fold-p ivy-text)))
964
959
(dolist (re regexps)
965
960
(setq re-idx (1+ re-idx))
966
- (let* ((re (replace-regexp-in-string
967
- " " " \t "
968
- re))
961
+ (let* ((re (ivy--string-replace " " " \t " re))
969
962
(num (swiper--line-number (ivy-state-current ivy-last))))
970
963
(unless (memq this-command '(ivy-yank-word
971
964
ivy-yank-symbol
@@ -1272,7 +1265,7 @@ otherwise continue prompting for buffers."
1272
1265
" Search in all open buffers for STR."
1273
1266
(or
1274
1267
(ivy-more-chars)
1275
- (let* ((buffers (cl-remove -if-not #'swiper-all-buffer-p (buffer-list )))
1268
+ (let* ((buffers (cl-delete -if-not #'swiper-all-buffer-p (buffer-list )))
1276
1269
(re-full ivy-regex)
1277
1270
re re-tail
1278
1271
cands match
@@ -1494,7 +1487,7 @@ that we search only for one character."
1494
1487
(lambda ()
1495
1488
(with-ivy-window
1496
1489
(swiper--add-overlays (ivy--regex ivy-text))))))
1497
- (dolist (re (swiper --positive-regexps))
1490
+ (dolist (re (ivy --positive-regexps))
1498
1491
(swiper--add-overlays re))))
1499
1492
1500
1493
(defun swiper--isearch-candidate-pos (cand )
0 commit comments