[elpa] master 44b2d7d 300/399: ivy.el (ivy-insert-current-full): Add and bind to "C-M-y"

[Oleh Krehel]

branch: master
commit 44b2d7d6a8a81d1ed5c2aaa613eabe7e25c0b9a3
Author: Oleh Krehel <address@hidden>
Commit: Oleh Krehel <address@hidden>

    ivy.el (ivy-insert-current-full): Add and bind to "C-M-y"
    
    * counsel.el (counsel-yank-directory): Make obsolete.
    
    Fixes #2092
---
 counsel.el | 7 ++-----
 ivy.el     | 8 +++++++-
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/counsel.el b/counsel.el
index a835908..953b071 100644
--- a/counsel.el
+++ b/counsel.el
@@ -1693,14 +1693,11 @@ currently checked out."
   (let ((map (make-sparse-keymap)))
     (define-key map (kbd "C-DEL") 'counsel-up-directory)
     (define-key map (kbd "C-<backspace>") 'counsel-up-directory)
-    (define-key map (kbd "C-M-y") 'counsel-yank-directory)
     (define-key map (kbd "`") (ivy-make-magic-action 'counsel-find-file "b"))
     map))
 
-(defun counsel-yank-directory ()
-  "Yank the current directory into the minibuffer."
-  (interactive)
-  (insert ivy--directory))
+(define-obsolete-function-alias 'counsel-yank-directory 
'ivy-insert-current-full
+  "<2019-06-13 Thu>")
 
 (when (executable-find "git")
   (add-to-list 'ivy-ffap-url-functions 'counsel-github-url-p)
diff --git a/ivy.el b/ivy.el
index 5b13dc3..6611937 100644
--- a/ivy.el
+++ b/ivy.el
@@ -416,6 +416,7 @@ action functions.")
     (define-key map (kbd "M-r") 'ivy-toggle-regexp-quote)
     (define-key map (kbd "M-j") 'ivy-yank-word)
     (define-key map (kbd "M-i") 'ivy-insert-current)
+    (define-key map (kbd "C-M-y") 'ivy-insert-current-full)
     (define-key map (kbd "C-o") 'hydra-ivy/body)
     (define-key map (kbd "M-o") 'ivy-dispatching-done)
     (define-key map (kbd "C-M-o") 'ivy-dispatching-call)
@@ -4233,8 +4234,13 @@ Don't finish completion."
     (insert (substring-no-properties
              (ivy-state-current ivy-last) 0 end))))
 
+(defun ivy-insert-current-full ()
+  "Insert the full Yank the current directory into the minibuffer."
+  (interactive)
+  (insert ivy--directory))
+
 (define-obsolete-variable-alias 'ivy--preferred-re-builders
-    'ivy-preferred-re-builders "0.10.0")
+  'ivy-preferred-re-builders "0.10.0")
 
 (defcustom ivy-preferred-re-builders
   '((ivy--regex-plus . "ivy")