aboutsummaryrefslogtreecommitdiff
path: root/evil-vars.el
diff options
context:
space:
mode:
authorAxel Forsman <axelsfor@gmail.com>2023-07-14 22:06:07 +0200
committerAxel Forsman <axelsfor@gmail.com>2023-07-17 19:02:11 +0200
commitf84d3453b312bd8ec0a1c092d075bbc3d91e157b (patch)
tree332c2d802dbda3eef60de8c29e0480e0de1b562e /evil-vars.el
parent4b45f2619258374ebb34b07212806e77bc2997c3 (diff)
Read Ex commands from buffer
When lexing a string with string-match and its START argument, there is no way to anchor matches to the START position. Instead, one must either allocate substrings - as done prior to commit 56b43b6f7e014e905f85df1c542c67f46ea99566 - or use looking-at etc., instead. This commit opts for the latter. The Ex completion-at-point functions are also rewritten in order to avoid having to add ex-index text properties to the command string, since evil--ex-syntactic-context could be extended to provide that information just as easily.
Diffstat (limited to 'evil-vars.el')
-rw-r--r--evil-vars.el33
1 files changed, 4 insertions, 29 deletions
diff --git a/evil-vars.el b/evil-vars.el
index 2d8532a..3b3a3d0 100644
--- a/evil-vars.el
+++ b/evil-vars.el
@@ -1900,13 +1900,9 @@ Key sequences bound in this map are immediately executed.")
"Completion keymap for Ex.")
(defvar evil-ex-initial-input nil
- "Additional initial content of the ex command line.
-This content of this variable is appended to the ex command line
-if ex is started interactively.")
-
-(defvar evil-ex-shell-argument-initialized nil
- "This variable is set to t if shell command completion has been initialized.
-See `evil-ex-init-shell-argument-completion'.")
+ "Additional initial content of the Ex command line.
+This content of this variable is appended to the Ex command line
+when Ex is started interactively.")
(defvar evil-ex-commands nil
"Association list of command bindings and functions.")
@@ -1917,23 +1913,8 @@ See `evil-ex-init-shell-argument-completion'.")
(defvar evil-ex-current-buffer nil
"The buffer from which Ex was started.")
-(defvar evil-ex-expression nil
- "The evaluation tree.")
-
-(defvar evil-ex-reverse-range nil
- "Whether the current ex range was entered reversed.")
-
-(defvar evil-ex-command nil
- "The current Ex command.")
-
-(defvar evil-ex-previous-command nil
- "The previously executed Ex command.")
-
-(defvar evil-ex-cmd nil
- "The current Ex command string.")
-
(defvar evil-ex-point nil
- "The position of `point' when the ex command has been called.")
+ "The point position when the Ex command was called.")
(defvar evil-ex-range nil
"The current range of the Ex command.")
@@ -1944,12 +1925,6 @@ See `evil-ex-init-shell-argument-completion'.")
(defvar evil-ex-argument nil
"The current argument of the Ex command.")
-(defvar evil-ex-argument-handler nil
- "The argument handler for the current Ex command.")
-
-(defvar evil-ex-argument-types nil
- "Association list of argument handlers.")
-
(defvar evil-previous-shell-command nil
"The last shell command.")