[elpa] master f90bc8c 164/184: ivy.el (ivy-configure): Add :height

[Oleh Krehel]

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

    ivy.el (ivy-configure): Add :height
    
    * counsel.el (counsel-el): Fixup.
    (counsel-yank-pop-height): Remove obsolete alias after 4 months.
---
 counsel.el | 22 ++++++++++------------
 ivy.el     |  3 +++
 2 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/counsel.el b/counsel.el
index 84e83bb..2df98cc 100644
--- a/counsel.el
+++ b/counsel.el
@@ -313,16 +313,16 @@ Update the minibuffer with the amount of lines collected 
every
     (if (string= str "")
         (mapatoms
          (lambda (x)
-           (when (symbolp x)
+           (when (and (symbolp x) (funcall pred x))
              (push (symbol-name x) symbol-names))))
       (setq symbol-names (all-completions str obarray pred)))
     (ivy-read "Symbol name: " symbol-names
-              :caller 'counsel-el
-              :predicate pred
               :initial-input str
-              :action #'ivy-completion-in-region-action)))
+              :action #'ivy-completion-in-region-action
+              :caller 'counsel-el)))
 
-(add-to-list 'ivy-height-alist '(counsel-el . 7))
+(ivy-configure 'counsel-el
+  :height 7)
 
 ;;** `counsel-cl'
 (declare-function slime-symbol-start-pos "ext:slime")
@@ -387,7 +387,8 @@ Update the minibuffer with the amount of lines collected 
every
         (delete-region (car bnd) (cdr bnd)))
       (insert res))))
 
-(add-to-list 'ivy-height-alist '(counsel--generic . 7))
+(ivy-configure 'counsel--generic
+  :height 7)
 
 ;;;###autoload
 (defun counsel-clj ()
@@ -1758,10 +1759,10 @@ currently checked out."
             :caller 'counsel-git-log))
 
 (ivy-configure 'counsel-git-log
+  :height 4
   :unwind-fn #'counsel-delete-process
   :format-fn #'counsel--git-log-format-function)
 
-(add-to-list 'ivy-height-alist '(counsel-git-log . 4))
 (add-to-list 'counsel-async-split-string-re-alist '(counsel-git-log . "^commit 
"))
 (add-to-list 'counsel-async-ignore-re-alist '(counsel-git-log . "^[ \n]*$"))
 
@@ -4025,9 +4026,6 @@ Additional actions:\\<ivy-minibuffer-map>
           (const :tag "Dashes" "\n----\n")
           string))
 
-(define-obsolete-variable-alias 'counsel-yank-pop-height
-    'ivy-height-alist "0.11.0")
-
 (defun counsel--yank-pop-format-function (cand-pairs)
   "Transform CAND-PAIRS into a string for `counsel-yank-pop'."
   (ivy--format-function-generic
@@ -4183,8 +4181,8 @@ Note: Duplicate elements of `kill-ring' are always 
deleted."
               :caller 'counsel-yank-pop)))
 
 (ivy-configure 'counsel-yank-pop
+  :height 5
   :format-fn #'counsel--yank-pop-format-function)
-(add-to-list 'ivy-height-alist '(counsel-yank-pop . 5))
 
 (ivy-set-actions
  'counsel-yank-pop
@@ -4259,8 +4257,8 @@ matching the register's value description against a 
regexp in
                 :caller 'counsel-evil-registers)
     (user-error "Required feature `evil' not installed.")))
 (ivy-configure 'counsel-evil-registers
+  :height 5
   :format-fn #'counsel--yank-pop-format-function)
-(add-to-list 'ivy-height-alist '(counsel-evil-registers . 5))
 
 (defun counsel-evil-registers-action (s)
   "Paste contents of S, trimming the register part.
diff --git a/ivy.el b/ivy.el
index ed6d2c8..99f9d2e 100644
--- a/ivy.el
+++ b/ivy.el
@@ -1913,6 +1913,7 @@ May supersede `ivy-initial-inputs-alist'."
 (cl-defun ivy-configure (caller
                          &key
                            initial-input
+                           height
                            occur
                            update-fn
                            unwind-fn
@@ -1926,6 +1927,8 @@ May supersede `ivy-initial-inputs-alist'."
   (declare (indent 1))
   (when initial-input
     (ivy--alist-set 'ivy-initial-inputs-alist caller initial-input))
+  (when height
+    (ivy--alist-set 'ivy-height-alist caller height))
   (when occur
     (ivy-set-occur caller occur))
   (when update-fn