Small changes/fixes to vi-mode

extensions/vi-mode/commands.lisp

@@ -256,7 +256,7 @@
   (skip-whitespace-forward (current-point) t))
 
 (define-operator vi-indent (start end) ("<r>")
-    (:restore-point t)
+    (:move-point nil)
   (indent-points start end))
 
 ;; FIXME: support block
@@ -321,6 +321,12 @@
 (define-operator vi-change (beg end type) ("<R>")
     ()
   (vi-delete beg end type)
+  (when (eq type :line)
+    (let ((column (with-point ((p (current-point)))
+                    (point-column (or (and (line-offset p 1)
+                                           (back-to-indentation p))
+                                      (line-start p))))))
+      (move-to-column (current-point) column t)))
   (change-state 'insert))
 
 (define-operator vi-change-line (beg end type) ("<R>")
@@ -693,7 +699,12 @@
 (define-command vi-open-above () ()
   (line-start (current-point))
   (change-state 'insert)
-  (open-line 1))
+  (open-line 1)
+  (let ((column (with-point ((p (current-point)))
+                  (point-column (or (and (line-offset p 1)
+                                         (back-to-indentation p))
+                                    (line-start p))))))
+    (move-to-column (current-point) column t)))
 
 (define-command vi-jump-back (&optional (n 1)) ("p")
   (dotimes (i n)

extensions/vi-mode/core.lisp

@@ -44,7 +44,7 @@
 
 (defvar *last-repeat-keys* '())
 
-(defvar *default-cursor-color* nil)
+(defvar *default-cursor-color* "#ffb472")
 
 (defvar *enable-hook* '())
 (defvar *disable-hook* '())
@@ -154,7 +154,8 @@
   (let ((state (ensure-state name)))
     (setf *current-state* state)
     (state-enabled-hook state)
-    (set-attribute 'cursor :background (state-cursor-color state))))
+    (set-attribute 'cursor
+                   :background (or (state-cursor-color state) *default-cursor-color*))))
 
 (defmacro with-state (state &body body)
   (with-gensyms (old-state)
@@ -175,9 +176,8 @@
 (add-hook *post-command-hook* 'vi-post-command-hook)
 
 (defmethod state-enabled-hook :after ((state vi-state))
-  (when (state-cursor-type state)
-    (lem-if:update-cursor-shape (lem:implementation)
-                                (state-cursor-type state))))
+  (lem-if:update-cursor-shape (lem:implementation)
+                              (state-cursor-type state)))
 
 (defun vi-this-command-keys ()
   (append

extensions/vi-mode/states.lisp

@@ -48,7 +48,6 @@
 (define-state normal () ()
   (:default-initargs
    :name "NORMAL"
-   :cursor-color "IndianRed"
    :cursor-type :box
    :modeline-color 'state-modeline-yellow
    :keymaps (list *normal-keymap*)))
@@ -76,7 +75,7 @@
 ;;
 ;; Operator-pending state
 
-(define-state operator () ()
+(define-state operator (normal) ()
   (:default-initargs
    :keymaps (list *operator-keymap* *normal-keymap*)))
 

extensions/vi-mode/vi-mode.lisp

@@ -20,7 +20,8 @@
                 :*normal-keymap*
                 :*insert-keymap*
                 :*inner-text-objects-keymap*
-                :*outer-text-objects-keymap*)
+                :*outer-text-objects-keymap*
+                :*operator-keymap*)
   (:import-from :lem-vi-mode/visual
                 :*visual-keymap*)
   (:import-from :alexandria
@@ -34,6 +35,7 @@
            :*normal-keymap*
            :*insert-keymap*
            :*visual-keymap*
+           :*operator-keymap*
            :*ex-keymap*
            :*inner-text-objects-keymap*
            :*outer-text-objects-keymap*