From: Christian Heller Date: Thu, 7 Mar 2019 10:29:16 +0000 (+0100) Subject: Stronger match to vim char deletion and end of line behavior. X-Git-Url: https://plomlompom.com/repos/task?a=commitdiff_plain;h=2af70b677116cef8ae39f2b0eff32ad02a40ade8;p=plomvi.el Stronger match to vim char deletion and end of line behavior. --- diff --git a/plomvi.el b/plomvi.el index 54a96b4..8dd5117 100644 --- a/plomvi.el +++ b/plomvi.el @@ -163,8 +163,9 @@ Note that this ignores killed rectangles." (kill-rectangle (region-beginning) (region-end))) ((use-region-p) (kill-region (region-beginning) (region-end))) - (t - (delete-char 1)))) + ((not (= (line-beginning-position) (line-end-position))) + (delete-char 1) + (if (not (= (point) (line-beginning-position))) (backward-char))))) (defun plomvi-rectangle-mark() "Start marked rectangle, move right one char so a single column is visible." @@ -219,6 +220,12 @@ Note that this ignores killed rectangles." (interactive) (plomvi-mode -1)) +(defun plomvi-end-of-line() + "Move to end of line exclusive line break char." + (interactive) + (end-of-line) + (if (not (= (point) (line-beginning-position))) (backward-char))) + (defvar plomvi-mode-basic-map (make-sparse-keymap) "Keymap for `plomvi-mode' on read-only buffers. @@ -243,7 +250,7 @@ become available to be used for other purposes.") (define-key plomvi-mode-basic-map (kbd "g") 'plomvi-g-map) (define-key plomvi-g-map (kbd "g") 'beginning-of-buffer) (define-key plomvi-mode-basic-map (kbd "G") 'plomvi-goto-line) -(define-key plomvi-mode-basic-map (kbd "$") 'end-of-line) +(define-key plomvi-mode-basic-map (kbd "$") 'plomvi-end-of-line) (define-key plomvi-mode-basic-map (kbd "0") 'plomvi-prefix-zero-or-line-start) (define-key plomvi-mode-basic-map (kbd "1") 'digit-argument) (define-key plomvi-mode-basic-map (kbd "2") 'digit-argument)