Consider local keybindings when moving commands for the Motion state. (#517)

Instead of directly binding `H-j` to what was bound to `j`, for example, bind
`H-j` to an interactive lambda which first checks whether there is a local
binding for `j`.  If there is, use that.  If there is not, then call the orignal
command bound to `j`.

This should fix using the overrides in Magit buffers (see #493), where the
command bound to `H-k` seems to be based on where point is located when
`meow--save-origin-commands` is run.

Co-authored-by: okamsn <[email protected]>

Author: okamsn

meow-util.el

@@ -452,14 +452,34 @@ Looks up the state in meow-replace-state-name-list"
    (t nil)))
 
 (defun meow--save-origin-commands ()
+  "Save the commands overridden by the Motion map to modified bindings.
+
+The new key binding, modified by the prefix in
+`meow-motion-remap-prefix', is bound to a command that calls the
+command locally bound to the original key binding, or, if that is
+nil, the original command.
+
+For example, under the default and suggested settings, in a
+Magit status buffer, `k' could be bound to `meow-previous'
+and `H-k' would be bound to a command that would try
+to use the status buffer's original `k' binding at point."
   (cl-loop for key-code being the key-codes of meow-motion-state-keymap do
            (ignore-errors
              (let* ((key (meow--parse-input-event key-code))
                     (cmd (key-binding (kbd key))))
                (when (and (commandp cmd)
                           (not (equal cmd 'undefined)))
                  (let ((rebind-key (concat meow-motion-remap-prefix key)))
-                   (local-set-key (kbd rebind-key) cmd)))))))
+                   (local-set-key (kbd rebind-key)
+                                  (lambda ()
+                                    (interactive)
+                                    (call-interactively
+                                     ;; Local maps are those local to the buffer
+                                     ;; or a region of the buffer.
+                                     (if-let ((local (lookup-key (current-local-map) key)))
+                                         (or (command-remapping local)
+                                             local)
+                                       cmd))))))))))
 
 (defun meow--prepare-region-for-kill ()
   (when (and (equal 'line (cdr (meow--selection-type)))