[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] master fe057eb 14/90: Swiper should preserve column for empty inp
From: |
Oleh Krehel |
Subject: |
[elpa] master fe057eb 14/90: Swiper should preserve column for empty input |
Date: |
Tue, 30 Jun 2015 07:28:06 +0000 |
branch: master
commit fe057eb2ed7cc87a1eb9ee6ae52750dc7d5beab4
Author: Oleh Krehel <address@hidden>
Commit: Oleh Krehel <address@hidden>
Swiper should preserve column for empty input
swiper.el (swiper--update-input-ivy): When there's no input yet, don't
move point.
Re #125
---
ivy.el | 1 -
swiper.el | 6 +++++-
2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/ivy.el b/ivy.el
index 07aa28c..40e8330 100644
--- a/ivy.el
+++ b/ivy.el
@@ -1277,7 +1277,6 @@ BUFFER may be a string or nil."
(let ((pt (point))
(le (line-end-position)))
(forward-word 1)
- (setf (window-point) (point))
(if (> (point) le)
(goto-char pt)
(setq amend (buffer-substring-no-properties pt (point))))))
diff --git a/swiper.el b/swiper.el
index 27e864e..c27da2e 100644
--- a/swiper.el
+++ b/swiper.el
@@ -287,7 +287,11 @@ Please remove it and update the \"swiper\" package."))
(when (cl-plusp num)
(goto-char (point-min))
(forward-line (1- num))
- (re-search-forward re (line-end-position) t)
+ (if (and (equal ivy-text "")
+ (>= swiper--opoint (line-beginning-position))
+ (<= swiper--opoint (line-end-position)))
+ (goto-char swiper--opoint)
+ (re-search-forward re (line-end-position) t))
(isearch-range-invisible (line-beginning-position)
(line-end-position))
(unless (and (>= (point) (window-start))
- [elpa] master 04b5734 03/90: swiper.el (swiper-avy): Don't start on empty input, (continued)
- [elpa] master 04b5734 03/90: swiper.el (swiper-avy): Don't start on empty input, Oleh Krehel, 2015/06/30
- [elpa] master 23ffd5c 04/90: swiper.el (swiper--ivy): Don't double-quote preselect, Oleh Krehel, 2015/06/30
- [elpa] master d975e1a 06/90: Avoid ensuring font lock when magit-blame-mode is active, Oleh Krehel, 2015/06/30
- [elpa] master 5fdb7de 05/90: Allow to open an Info file on the file system, Oleh Krehel, 2015/06/30
- [elpa] master f899a22 08/90: Add info lookup binding to counsel-describe-map, Oleh Krehel, 2015/06/30
- [elpa] master a0347d8 09/90: counsel.el (counsel-info-lookup-symbol): Add a require, Oleh Krehel, 2015/06/30
- [elpa] master 3256d68 07/90: Change the :matcher interface, Oleh Krehel, 2015/06/30
- [elpa] master 5f7c787 11/90: counsel.el (counsel-find-file-at-point): New defcustom, Oleh Krehel, 2015/06/30
- [elpa] master efd74b8 10/90: counsel.el (counsel-find-file): Extend `find-file', Oleh Krehel, 2015/06/30
- [elpa] master 8212110 15/90: Handle symbol-at-point better in non-Elisp buffers, Oleh Krehel, 2015/06/30
- [elpa] master fe057eb 14/90: Swiper should preserve column for empty input,
Oleh Krehel <=
- [elpa] master 1a193b0 16/90: ivy.el (ivy--done): Set ivy--current, Oleh Krehel, 2015/06/30
- [elpa] master 97abd3c 17/90: ivy.el (ivy-virtual): New defface, Oleh Krehel, 2015/06/30
- [elpa] master 3c8daba 19/90: Fixup compilation warnings, Oleh Krehel, 2015/06/30
- [elpa] master ecb93a6 18/90: Regexp-quote name of candidate buffer to be preselected, Oleh Krehel, 2015/06/30
- [elpa] master 40a938b 21/90: ivy.el (ivy-minibuffer-map): Bind ivy-yank-word to "M-j", Oleh Krehel, 2015/06/30
- [elpa] master 00a1b02 22/90: counsel-git-grep should quote strings better, Oleh Krehel, 2015/06/30
- [elpa] master 52a083e 13/90: ivy.el (ivy-yank-word): New command, Oleh Krehel, 2015/06/30
- [elpa] master 9ae55b4 12/90: ivy.el (ivy-recentf): New command, Oleh Krehel, 2015/06/30
- [elpa] master ed60d31 20/90: Make counsel-git-grep fully async, Oleh Krehel, 2015/06/30
- [elpa] master bef708c 23/90: ivy.el (ivy--switch-buffer-action): Add work-around, Oleh Krehel, 2015/06/30