[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] master 680f6e2 44/54: swiper.el (swiper--ivy): Use minibuffer-all
From: |
Oleh Krehel |
Subject: |
[elpa] master 680f6e2 44/54: swiper.el (swiper--ivy): Use minibuffer-allow-text-properties |
Date: |
Tue, 29 Sep 2015 14:10:07 +0000 |
branch: master
commit 680f6e2255d3ad04035c842d0ad8c38c019e3fbc
Author: Oleh Krehel <address@hidden>
Commit: Oleh Krehel <address@hidden>
swiper.el (swiper--ivy): Use minibuffer-allow-text-properties
Using `minibuffer-allow-text-properties' makes Emacs not strip the text
properties from the result of `read-from-minibuffer'. This is better
because a function call result is used instead of a global var to pass
this info.
---
swiper.el | 28 +++++++++++++++-------------
1 files changed, 15 insertions(+), 13 deletions(-)
diff --git a/swiper.el b/swiper.el
index 3f800f8..cd13b8c 100644
--- a/swiper.el
+++ b/swiper.el
@@ -266,22 +266,24 @@ Please remove it and update the \"swiper\" package."))
(let ((candidates (swiper--candidates))
(preselect (buffer-substring-no-properties
(line-beginning-position)
- (line-end-position))))
+ (line-end-position)))
+ (minibuffer-allow-text-properties t)
+ res)
(unwind-protect
- (ivy-read
- "Swiper: "
- candidates
- :initial-input initial-input
- :keymap swiper-map
- :preselect preselect
- :require-match t
- :update-fn #'swiper--update-input-ivy
- :unwind #'swiper--cleanup
- :re-builder #'swiper--re-builder
- :history 'swiper-history)
+ (setq res (ivy-read
+ "Swiper: "
+ candidates
+ :initial-input initial-input
+ :keymap swiper-map
+ :preselect preselect
+ :require-match t
+ :update-fn #'swiper--update-input-ivy
+ :unwind #'swiper--cleanup
+ :re-builder #'swiper--re-builder
+ :history 'swiper-history))
(if (null ivy-exit)
(goto-char swiper--opoint)
- (swiper--action ivy--current ivy-text)))))
+ (swiper--action res ivy-text)))))
(defun swiper--ensure-visible ()
"Remove overlays hiding point."
- [elpa] master 478e4e4 32/54: Make line numbers in swiper into display properties, (continued)
- [elpa] master 478e4e4 32/54: Make line numbers in swiper into display properties, Oleh Krehel, 2015/10/07
- [elpa] master 8fccfd3 03/54: (counsel-locate): Support OS X, Oleh Krehel, 2015/10/07
- [elpa] master 7684455 15/54: counsel.el (counsel--py-action): Work with "C-M-n", Oleh Krehel, 2015/10/07
- [elpa] master 9a509df 47/54: ivy.el (ivy--resize-minibuffer-to-fit): Make compatible with 24.3, Oleh Krehel, 2015/10/07
- [elpa] master d5ae6a3 30/54: ivy.el (ivy--resize-minibuffer-to-fit): Make compatible with 24.3, Oleh Krehel, 2015/10/07
- [elpa] master d8d7ed4 42/54: Fix minibuffer collapses to one line, Oleh Krehel, 2015/10/07
- [elpa] master db8fb1b 39/54: Make "<left>" and "<right>" behave as in fundamental-mode, Oleh Krehel, 2015/10/07
- [elpa] master 8b73497 54/54: Merge commit 'ba49407c5b4c719dd5dcc298c260513abf0c70df' from swiper, Oleh Krehel, 2015/10/07
- [elpa] master 9413acb 52/54: counsel.el (counsel--find-symbol): Allow to jump back with pop-tag-mark, Oleh Krehel, 2015/10/07
- [elpa] master aa3e1dd 51/54: swiper.el (swiper-font-lock-ensure): Add mu4e, Oleh Krehel, 2015/10/07
- [elpa] master 680f6e2 44/54: swiper.el (swiper--ivy): Use minibuffer-allow-text-properties,
Oleh Krehel <=
- [elpa] master 5fef653 08/54: ivy.el (ivy-completing-read): Fix up last commit, Oleh Krehel, 2015/10/07
- [elpa] master 1f93f40 16/54: counsel.el (counsel-cl): New command, Oleh Krehel, 2015/10/07
- [elpa] master 67cd682 06/54: Fix #126 again., Oleh Krehel, 2015/10/07
- [elpa] master 1f64cb8 11/54: ivy: enlarge the minibuffer window if the candiate list doesn't fit, Oleh Krehel, 2015/10/07
- [elpa] master f164cfe 33/54: counsel.el (counsel-yank-pop): New command, Oleh Krehel, 2015/10/07
- [elpa] master 03d93f7 40/54: ivy.el (ivy-switch-buffer): Make "M-o r" rename buffer, Oleh Krehel, 2015/10/07
- [elpa] master 8d754de 17/54: ivy.el (ivy-display-style): New defcustom, Oleh Krehel, 2015/10/07
- [elpa] master efd1f09 48/54: Make ivy-display-style more compatible with 24.3, Oleh Krehel, 2015/10/07
- [elpa] master b45d10c 43/54: Revert multiple frames workaround, Oleh Krehel, 2015/10/07
- [elpa] master 3ce7df8 49/54: Truncate minibuffer prompts longer than window-width, Oleh Krehel, 2015/10/07