[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] master 6fd1620 235/399: swiper.el (swiper--recenter-p): Extract
From: |
Oleh Krehel |
Subject: |
[elpa] master 6fd1620 235/399: swiper.el (swiper--recenter-p): Extract |
Date: |
Sat, 20 Jul 2019 14:57:30 -0400 (EDT) |
branch: master
commit 6fd16207f80df9ab6423c78fc715c2256d6cc437
Author: Oleh Krehel <address@hidden>
Commit: Oleh Krehel <address@hidden>
swiper.el (swiper--recenter-p): Extract
Re #2059
---
swiper.el | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/swiper.el b/swiper.el
index 990086d..71c3805 100644
--- a/swiper.el
+++ b/swiper.el
@@ -767,6 +767,10 @@ Matched candidates should have `swiper-invocation-face'."
(goto-char (point-min))
(isearch-clean-overlays)))
+(defun swiper--recenter-p ()
+ (or (display-graphic-p)
+ (not recenter-redisplay)))
+
(defun swiper--update-input-ivy ()
"Called when `ivy' input is updated."
(with-ivy-window
@@ -809,8 +813,7 @@ Matched candidates should have `swiper-invocation-face'."
(setq swiper--current-match-start (match-beginning 0))))
(isearch-range-invisible (line-beginning-position)
(line-end-position))
- (when (and (or (display-graphic-p)
- (not recenter-redisplay))
+ (when (and (swiper--recenter-p)
(or
(< (point) (window-start))
(> (point) (window-end (ivy-state-window ivy-last)
t))))
@@ -819,14 +822,12 @@ Matched candidates should have `swiper-invocation-face'."
(swiper--add-overlays
re
(max
- (if (or (display-graphic-p)
- (not recenter-redisplay))
+ (if (swiper--recenter-p)
(window-start)
(line-beginning-position (- (window-height))))
swiper--point-min)
(min
- (if (or (display-graphic-p)
- (not recenter-redisplay))
+ (if (swiper--recenter-p)
(window-end (selected-window) t)
(line-end-position (window-height)))
swiper--point-max))))))))
@@ -952,8 +953,7 @@ the face, window and priority of the overlay."
(cond (swiper-action-recenter
(recenter))
((and swiper--current-window-start
- (or (display-graphic-p)
- (not recenter-redisplay)))
+ (swiper--recenter-p))
(set-window-start (selected-window)
swiper--current-window-start)))
(when (/= (point) swiper--opoint)
(unless (and transient-mark-mode mark-active)
- [elpa] master ecff164 215/399: ivy.el (ivy-insert-current): Minor simplification, (continued)
- [elpa] master ecff164 215/399: ivy.el (ivy-insert-current): Minor simplification, Oleh Krehel, 2019/07/20
- [elpa] master 8a8aea2 219/399: counsel.el (counsel-company): Use company-prefix, Oleh Krehel, 2019/07/20
- [elpa] master fa9acdb 222/399: swiper.el (swiper-isearch-thing-at-point): Add symbol boundaries, Oleh Krehel, 2019/07/20
- [elpa] master 6768214 221/399: ivy.el (ivy--insert-symbol-boundaries): Extract, Oleh Krehel, 2019/07/20
- [elpa] master 2e4f2fb 213/399: Fix grep-occur when using multi-pass re-builders, Oleh Krehel, 2019/07/20
- [elpa] master a9e81f8 220/399: ivy.el: Don't offer virtual buffers for plain switch-to-buffer, Oleh Krehel, 2019/07/20
- [elpa] master 5eea0af 229/399: ivy.el (ivy--minibuffer-index-bounds): Simplify logic, Oleh Krehel, 2019/07/20
- [elpa] master c1ff0d6 228/399: ivy.el: Fix compiler warning, Oleh Krehel, 2019/07/20
- [elpa] master 6ec1126 225/399: ivy.el (ivy-help): Set org-hide-emphasis-markers, Oleh Krehel, 2019/07/20
- [elpa] master cc56ec0 231/399: swiper.el (swiper-isearch-format-function): Add, Oleh Krehel, 2019/07/20
- [elpa] master 6fd1620 235/399: swiper.el (swiper--recenter-p): Extract,
Oleh Krehel <=
- [elpa] master 1d08b29 233/399: swiper.el (swiper-isearch): Ensure font lock, Oleh Krehel, 2019/07/20
- [elpa] master b49f17f 224/399: counsel.el (counsel-ag-function): Add dynamic case folding, Oleh Krehel, 2019/07/20
- [elpa] master e9f0772 218/399: ivy-test.el (counsel-find-file-with-dollars): Adjust, Oleh Krehel, 2019/07/20
- [elpa] master eee9716 236/399: Add open in dired action to counsel-file-jump, Oleh Krehel, 2019/07/20
- [elpa] master fb64ea3 237/399: swiper.el (swiper-mc): Works for swiper-isearch, Oleh Krehel, 2019/07/20
- [elpa] master 39a9e94 232/399: swiper.el (swiper-isearch-current-match): Add, Oleh Krehel, 2019/07/20
- [elpa] master b7574fe 234/399: swiper.el: Extra condition to recenter in terminal, Oleh Krehel, 2019/07/20
- [elpa] master 10755b2 239/399: swiper.el (swiper-isearch-toggle): Add, Oleh Krehel, 2019/07/20
- [elpa] master 38f8e45 242/399: swiper.el (swiper-isearch-toggle): Fix candidate jump in toggle, Oleh Krehel, 2019/07/20
- [elpa] master d9d6064 241/399: ivy.el (ivy-completion-in-region-action): Obey :exit-function, Oleh Krehel, 2019/07/20