[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] master 4147453 212/399: swiper.el (swiper-isearch-thing-at-point)
From: |
Oleh Krehel |
Subject: |
[elpa] master 4147453 212/399: swiper.el (swiper-isearch-thing-at-point): Add |
Date: |
Sat, 20 Jul 2019 14:57:25 -0400 (EDT) |
branch: master
commit 4147453ebec8484011bcd8cb5c6476515c71975d
Author: Oleh Krehel <address@hidden>
Commit: Oleh Krehel <address@hidden>
swiper.el (swiper-isearch-thing-at-point): Add
Re #2027
---
swiper.el | 19 +++++++++++++------
1 file changed, 13 insertions(+), 6 deletions(-)
diff --git a/swiper.el b/swiper.el
index b49a85f..b643756 100644
--- a/swiper.el
+++ b/swiper.el
@@ -1268,7 +1268,7 @@ come back to the same place as when \"a\" was initially
entered.")
(swiper--add-cursor-overlay)))
(swiper--cleanup)))
-(defun swiper-isearch-symbol-at-point ()
+(defun swiper-isearch-thing-at-point ()
"Insert `symbol-at-point' into the minibuffer of `swiper-isearch'.
When not running `swiper-isearch' already, start it."
(interactive)
@@ -1280,15 +1280,22 @@ When not running `swiper-isearch' already, start it."
(setq swiper--isearch-point-history
(list (cons "" (car bnd))))
(insert str))
- (let ((bnd (bounds-of-thing-at-point 'symbol)))
- (when bnd
- (goto-char (car bnd))
- (swiper-isearch (buffer-substring-no-properties (car bnd) (cdr
bnd)))))))
+ (let (thing)
+ (if (use-region-p)
+ (progn
+ (goto-char (region-beginning))
+ (setq thing (ivy-thing-at-point))
+ (deactivate-mark))
+ (let ((bnd (bounds-of-thing-at-point 'symbol)))
+ (when bnd
+ (goto-char (car bnd)))
+ (setq thing (ivy-thing-at-point))))
+ (swiper-isearch thing))))
(defvar swiper-isearch-map
(let ((map (make-sparse-keymap)))
(set-keymap-parent map swiper-map)
- (define-key map (kbd "M-n") 'swiper-isearch-symbol-at-point)
+ (define-key map (kbd "M-n") 'swiper-isearch-thing-at-point)
map)
"Keymap for `swiper-isearch'.")
- [elpa] master afeda97 198/399: counsel.el (counsel-company): Add :caller, (continued)
- [elpa] master afeda97 198/399: counsel.el (counsel-company): Add :caller, Oleh Krehel, 2019/07/20
- [elpa] master 3b25d30 206/399: counsel.el (counsel-compile): Add predicate to counsel-compile-env, Oleh Krehel, 2019/07/20
- [elpa] master 3d0887f 204/399: counsel.el (counsel-compile): Add counsel-compile-env, Oleh Krehel, 2019/07/20
- [elpa] master 605cee0 202/399: counsel.el (counsel-compile): Fix saving of blddir, Oleh Krehel, 2019/07/20
- [elpa] master c9f2318 203/399: counsel.el (counsel-compile): Add helper for formatting text, Oleh Krehel, 2019/07/20
- [elpa] master 276599c 201/399: doc/ivy.texi: Generate from doc/ivy.org, Oleh Krehel, 2019/07/20
- [elpa] master 3f27e25 207/399: counsel.el (counsel-compile): Don't squash default-directory, Oleh Krehel, 2019/07/20
- [elpa] master 6de6233 205/399: counsel.el (counsel-compile): New counsel-compile-env helper, Oleh Krehel, 2019/07/20
- [elpa] master f628eb3 210/399: swiper.el (swiper-isearch-symbol-at-point): Add, Oleh Krehel, 2019/07/20
- [elpa] master bed783e 217/399: ivy-test.el (swiper-isearch-case-fold): Add test, Oleh Krehel, 2019/07/20
- [elpa] master 4147453 212/399: swiper.el (swiper-isearch-thing-at-point): Add,
Oleh Krehel <=
- [elpa] master 9a2b110 214/399: ivy.el (ivy-insert-current): Insert text without properties, Oleh Krehel, 2019/07/20
- [elpa] master f1b3fa4 209/399: swiper.el (swiper-isearch): Support swiper-goto-start-of-match, Oleh Krehel, 2019/07/20
- [elpa] master bd958e7 208/399: counsel.el (counsel-org-files): Re-use org-attach-dir, Oleh Krehel, 2019/07/20
- [elpa] master 9c1e1c3 216/399: swiper.el (swiper-isearch-function): Obey ivy-case-fold-search-default, Oleh Krehel, 2019/07/20
- [elpa] master 6f56049 230/399: ivy.el (ivy--minibuffer-index-bounds): Make pure, Oleh Krehel, 2019/07/20
- [elpa] master 9eb5275 227/399: ivy.el (ivy--minibuffer-index-bounds): Extract, Oleh Krehel, 2019/07/20
- [elpa] master f292ed3 226/399: ivy.el (ivy-help): Reveal all Org contents, Oleh Krehel, 2019/07/20
- [elpa] master 3a16cec 223/399: ivy.el (ivy-occur): Don't setq-local ivy--directory, Oleh Krehel, 2019/07/20
- [elpa] master 9e513d0 211/399: swiper.el (swiper-thing-at-point): Add, Oleh Krehel, 2019/07/20
- [elpa] master ecff164 215/399: ivy.el (ivy-insert-current): Minor simplification, Oleh Krehel, 2019/07/20