Further fix char deletion in-line rules.

diff --git a/plomvi.el b/plomvi.el
index 8dd5117f6bd1907c7e7eb09c51ad11e3aa621a53..70903b31b5580be28a74c8dabec4aebc4c64b7ac 100644 (file)
--- a/plomvi.el
+++ b/plomvi.el
@@ -163,9 +163,10 @@ Note that this ignores killed rectangles."
     (kill-rectangle (region-beginning) (region-end)))
    ((use-region-p)
     (kill-region (region-beginning) (region-end)))
+   ((not (= (point) (line-end-position)))
+    (delete-char 1))
    ((not (= (line-beginning-position) (line-end-position)))
-    (delete-char 1)
-    (if (not (= (point) (line-beginning-position))) (backward-char)))))
+    (backward-char) (delete-char 1))))
 
 (defun plomvi-rectangle-mark()
   "Start marked rectangle, move right one char so a single column is visible."
@@ -220,12 +221,6 @@ 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.
 
@@ -250,7 +245,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 "$") 'plomvi-end-of-line)
+(define-key plomvi-mode-basic-map (kbd "$") '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)