[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] master 77e7c8f 24/90: Account for minibuffer-depth-indication-mod
From: |
Oleh Krehel |
Subject: |
[elpa] master 77e7c8f 24/90: Account for minibuffer-depth-indication-mode |
Date: |
Tue, 30 Jun 2015 07:28:11 +0000 |
branch: master
commit 77e7c8f86f868296824eff7b142dc51fa9b38dbf
Author: Oleh Krehel <address@hidden>
Commit: Oleh Krehel <address@hidden>
Account for minibuffer-depth-indication-mode
* ivy.el (ivy--insert-prompt): When `minibuffer-depth-indication-mode'
is on, and `minibuffer-depth' is more than 1, prepend it to prompt.
Fixes #134
---
ivy.el | 19 ++++++++++++-------
1 files changed, 12 insertions(+), 7 deletions(-)
diff --git a/ivy.el b/ivy.el
index 83857c2..f4ff270 100644
--- a/ivy.el
+++ b/ivy.el
@@ -959,7 +959,7 @@ Everything after \"!\" should not match."
"Update the prompt according to `ivy--prompt'."
(when ivy--prompt
(unless (memq this-command '(ivy-done ivy-alt-done ivy-partial-or-done
- counsel-find-symbol))
+ counsel-find-symbol))
(setq ivy--prompt-extra ""))
(let (head tail)
(if (string-match "\\(.*\\): \\'" ivy--prompt)
@@ -972,12 +972,17 @@ Everything after \"!\" should not match."
(std-props '(front-sticky t rear-nonsticky t field t read-only t))
(n-str
(format
- (concat head
- ivy--prompt-extra
- tail
- (if ivy--directory
- (abbreviate-file-name ivy--directory)
- ""))
+ (concat
+ (if (and (bound-and-true-p minibuffer-depth-indicate-mode)
+ (> (minibuffer-depth) 1))
+ (format "[%d] " (minibuffer-depth))
+ "")
+ head
+ ivy--prompt-extra
+ tail
+ (if ivy--directory
+ (abbreviate-file-name ivy--directory)
+ ""))
(or (and (ivy-state-dynamic-collection ivy-last)
ivy--full-length)
ivy--length))))
- [elpa] master 1a193b0 16/90: ivy.el (ivy--done): Set ivy--current, (continued)
- [elpa] master 1a193b0 16/90: ivy.el (ivy--done): Set ivy--current, Oleh Krehel, 2015/06/30
- [elpa] master 97abd3c 17/90: ivy.el (ivy-virtual): New defface, Oleh Krehel, 2015/06/30
- [elpa] master 3c8daba 19/90: Fixup compilation warnings, Oleh Krehel, 2015/06/30
- [elpa] master ecb93a6 18/90: Regexp-quote name of candidate buffer to be preselected, Oleh Krehel, 2015/06/30
- [elpa] master 40a938b 21/90: ivy.el (ivy-minibuffer-map): Bind ivy-yank-word to "M-j", Oleh Krehel, 2015/06/30
- [elpa] master 00a1b02 22/90: counsel-git-grep should quote strings better, Oleh Krehel, 2015/06/30
- [elpa] master 52a083e 13/90: ivy.el (ivy-yank-word): New command, Oleh Krehel, 2015/06/30
- [elpa] master 9ae55b4 12/90: ivy.el (ivy-recentf): New command, Oleh Krehel, 2015/06/30
- [elpa] master ed60d31 20/90: Make counsel-git-grep fully async, Oleh Krehel, 2015/06/30
- [elpa] master bef708c 23/90: ivy.el (ivy--switch-buffer-action): Add work-around, Oleh Krehel, 2015/06/30
- [elpa] master 77e7c8f 24/90: Account for minibuffer-depth-indication-mode,
Oleh Krehel <=
- [elpa] master 607d943 25/90: Add a hack for kill-buffer and invisible buffer, Oleh Krehel, 2015/06/30
- [elpa] master 3699897 26/90: counsel.el (counsel-symbol-at-point): Improve, Oleh Krehel, 2015/06/30
- [elpa] master 03e7e70 27/90: counsel.el (counsel-M-x): New command, Oleh Krehel, 2015/06/30
- [elpa] master efa751b 28/90: counsel.el (counsel-M-x): Piggyback on smex for sorting, Oleh Krehel, 2015/06/30
- [elpa] master ebead12 29/90: Add fuzzy matching function, Oleh Krehel, 2015/06/30
- [elpa] master 84e20a3 30/90: Fixup ivy-resume for file completion, Oleh Krehel, 2015/06/30
- [elpa] master d24397b 32/90: counsel.el (counsel-M-x-initial-input): New defcustom, Oleh Krehel, 2015/06/30
- [elpa] master e016d48 31/90: Allow "TAB" to complete when input starts with "^", Oleh Krehel, 2015/06/30
- [elpa] master 7f2cc7c 33/90: counsel.el: Add a bunch of autoload cookies, Oleh Krehel, 2015/06/30
- [elpa] master 165c176 34/90: counsel.el (counsel-find-file-ignore-regexp): Default to nil, Oleh Krehel, 2015/06/30