aboutsummaryrefslogtreecommitdiff
path: root/evil-vars.el
diff options
context:
space:
mode:
authorAxel Forsman <axel@axelf.se>2023-08-25 13:41:39 +0200
committerAxel Forsman <axelsfor@gmail.com>2023-08-27 13:07:58 +0200
commita09fdca0b35ef4289cf55d7b0ffadf4cf3a5c9fc (patch)
tree3a5759f4865a01542ff90f4f1c1c18cc4c94b587 /evil-vars.el
parenta8663a22b6f65513d9f1f610ed19941b14161490 (diff)
Reselect minibuffer when quitting command-line win
Pressing C-f while editing an Ex command to open the command-line window and later quitting that window used to not reselect the Ex command line, but instead just continue the recursive edit in some previous window. This was specially confusing before commit 02004bce6884619e687654d333b75c90f8fc27d0, as the evil-ex-abort hack did not trigger, leaving you in a bad state with evil-ex-current-buffer set to t. This commit fixes that by setting the delete-window window parameter on the command-line window to a function that switches back to the minibuffer after deleting the window, which closes #1379. This commit also replaces the split-window call with a display-buffer invocation, to always spawn the window at the bottom of the frame, but also allow the user to override this behavior.
Diffstat (limited to 'evil-vars.el')
-rw-r--r--evil-vars.el10
1 files changed, 1 insertions, 9 deletions
diff --git a/evil-vars.el b/evil-vars.el
index bd2b29e..873d1a6 100644
--- a/evil-vars.el
+++ b/evil-vars.el
@@ -1351,7 +1351,7 @@ line. If this option is non-nil, this behavior is reversed."
"Face for interactive replacement text."
:group 'evil)
-(defcustom evil-command-window-height 8
+(defcustom evil-command-window-height 7
"Height (in lines) of the command line window.
Set to 0 to use the default height for `split-window'."
:type 'integer
@@ -1987,14 +1987,6 @@ when Ex is started interactively.")
"Non-nil if the previous was a search.
Otherwise the previous command is assumed as substitute.")
-;;; Command line window
-
-(evil-define-local-var evil-command-window-execute-fn nil
- "The command to execute when exiting the command line window.")
-
-(evil-define-local-var evil-command-window-cmd-key nil
- "The key for the command that opened the command line window (:, /, or ?).")
-
;; The lazy-highlighting framework
(evil-define-local-var evil-ex-active-highlights-alist nil
"An alist of currently active highlights.")