branch: externals/ivy
commit 679a39885cdd63fb0bf99c78b0a2dfd611e03eca
Merge: cabbd91f16 790042e81e
Author: Basil L. Contovounesios <[email protected]>
Commit: Basil L. Contovounesios <[email protected]>
Merge branch 'master' into externals/ivy
---
ivy.el | 12 ++++--------
1 file changed, 4 insertions(+), 8 deletions(-)
diff --git a/ivy.el b/ivy.el
index 26a31d2927..5a221bc395 100644
--- a/ivy.el
+++ b/ivy.el
@@ -4912,16 +4912,12 @@ The \"pulse\" duration is determined by
`ivy-pulse-delay'."
(setq ivy--pulse-overlay nil)))
(defun ivy-kill-ring-save ()
- "Store the current candidates into the kill ring.
+ "Save the current candidates in the kill ring.
If the region is active, forward to `kill-ring-save' instead."
(interactive)
- (if (region-active-p)
- (call-interactively 'kill-ring-save)
- (kill-new
- (mapconcat
- #'identity
- ivy--old-cands
- "\n"))))
+ (if (use-region-p)
+ (call-interactively #'kill-ring-save)
+ (kill-new (string-join ivy--old-cands "\n"))))
(defun ivy-insert-current ()
"Make the current candidate into current input.
