[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] externals/ivy-explorer e5148ba 21/25: Address changes according t
From: |
Stefan Monnier |
Subject: |
[elpa] externals/ivy-explorer e5148ba 21/25: Address changes according to https://github.com/melpa/melpa/pull/5850#issuecomment-445474712 |
Date: |
Tue, 8 Jan 2019 12:25:59 -0500 (EST) |
branch: externals/ivy-explorer
commit e5148bac5f19b032652a1d66e6997fb7af80788a
Author: Clemera <address@hidden>
Commit: Clemera <address@hidden>
Address changes according to
https://github.com/melpa/melpa/pull/5850#issuecomment-445474712
---
ivy-explorer.el | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
diff --git a/ivy-explorer.el b/ivy-explorer.el
index 76ae3a3..e41ed62 100644
--- a/ivy-explorer.el
+++ b/ivy-explorer.el
@@ -129,8 +129,8 @@ menu string as `cdr'."
;; * Ivy explorer window, adapted from lv.el
-(defvar display-line-numbers nil)
-(defvar golden-ratio-mode nil)
+(defvar display-line-numbers)
+(defvar golden-ratio-mode)
(defvar ivy-explorer--window nil
"Holds the current ivy explorer window.")
@@ -264,8 +264,7 @@ If called from code ACTION is the action to trigger
afterwards."
(run-at-time 0 nil (or action 'ivy-alt-done))))))
;; adapted from ivy-hydra
-(defvar ivy-dispatching-done-columns 2
- "Number of columns to use if the hint does not fit on one line.")
+
(defun ivy-explorer-avy-dispatching-done-hydra ()
"Choose action and afterwards target using `hydra'."
@@ -277,7 +276,9 @@ If called from code ACTION is the action to trigger
afterwards."
(format "[%s] %s" (nth 0 x) (nth 2 x)))
(cdr actions) ", "))))
(n-columns (if (> estimated-len (window-width))
- ivy-dispatching-done-columns
+ (or (and (bound-and-true-p
ivy-dispatching-done-columns)
+ ivy-dispatching-done-columns)
+ 2)
nil)))
(if (null (ivy--actionp actions))
(ivy-done)
- [elpa] externals/ivy-explorer 3d5ec57 04/25: Markup fixes, (continued)
- [elpa] externals/ivy-explorer 3d5ec57 04/25: Markup fixes, Stefan Monnier, 2019/01/08
- [elpa] externals/ivy-explorer 6e7c48e 16/25: Version bump, Stefan Monnier, 2019/01/08
- [elpa] externals/ivy-explorer 6097779 08/25: Correct comment, Stefan Monnier, 2019/01/08
- [elpa] externals/ivy-explorer bc39d3a 10/25: Fix function names, Stefan Monnier, 2019/01/08
- [elpa] externals/ivy-explorer f6800b0 12/25: Improve description, Stefan Monnier, 2019/01/08
- [elpa] externals/ivy-explorer aba6dc0 18/25: Rephrase description, Stefan Monnier, 2019/01/08
- [elpa] externals/ivy-explorer 0139dad 03/25: Add demo and description, Stefan Monnier, 2019/01/08
- [elpa] externals/ivy-explorer d298de9 13/25: Change heading, Stefan Monnier, 2019/01/08
- [elpa] externals/ivy-explorer 4916592 22/25: Inherit separator face from `lv`, Stefan Monnier, 2019/01/08
- [elpa] externals/ivy-explorer 26b8bca 14/25: Improve description, Stefan Monnier, 2019/01/08
- [elpa] externals/ivy-explorer e5148ba 21/25: Address changes according to https://github.com/melpa/melpa/pull/5850#issuecomment-445474712,
Stefan Monnier <=
- [elpa] externals/ivy-explorer bfcc67a 15/25: Rebind ivy-avy to ivy-explorer version, Stefan Monnier, 2019/01/08
- [elpa] externals/ivy-explorer a673278 24/25: Add melpa badges and install instructions, Stefan Monnier, 2019/01/08
- [elpa] externals/ivy-explorer 783816a 25/25: Fixes #2, Stefan Monnier, 2019/01/08
- [elpa] externals/ivy-explorer 016fca0 20/25: Add note about counsel, Stefan Monnier, 2019/01/08
- [elpa] externals/ivy-explorer 05477ee 09/25: Adjust according to checkdoc, Stefan Monnier, 2019/01/08
- [elpa] externals/ivy-explorer d69c816 19/25: Respect ivy-use-selectable-prompt, Stefan Monnier, 2019/01/08
- [elpa] externals/ivy-explorer dd66fbf 17/25: Improve description, Stefan Monnier, 2019/01/08
- [elpa] externals/ivy-explorer 8bd4d0f 01/25: Initial commit, Stefan Monnier, 2019/01/08
- [elpa] externals/ivy-explorer 212f8d2 23/25: Use fallback to border face if lv not installed, Stefan Monnier, 2019/01/08
- [elpa] externals/ivy-explorer 18b11ba 11/25: Fix unused argument, Stefan Monnier, 2019/01/08