Fix #1460 where cursor is misplaced after C-o at eol (#1461)

Author: tomdl89

evil-commands.el

@@ -4650,10 +4650,12 @@ if the previous state was Emacs state."
       `(progn
          (with-current-buffer ,(current-buffer)
            (evil-change-state ',evil-state)
-           (setq evil-move-cursor-back ',evil-move-cursor-back)))
+           (setq evil-move-cursor-back ',evil-move-cursor-back
+                 evil-move-beyond-eol ',evil-move-beyond-eol)))
     'post-command-hook)
   (setq evil-move-cursor-back nil)
   (evil-normal-state)
+  (setq evil-move-beyond-eol t)
   (evil-echo "Switched to Normal state for the next command ..."))
 
 (defun evil-stop-execute-in-emacs-state ()

evil-tests.el

@@ -306,7 +306,13 @@ with `M-x evil-tests-run'"))
       ("\C-oA")
       (ert-info ("Should return to insert state after insert state command")
         (should (evil-insert-state-p)))
-      ("bcdef[]\n"))))
+      ("bcdef[]\n"))
+    (ert-info ("Cursor is placed correctly afterwards")
+      (evil-test-buffer
+       :state insert
+       "abcdefg[]"
+       ("\C-o~")
+       "abcdefG[]"))))
 
 (defun evil-test-suppress-keymap (state)
   "Verify that `self-insert-command' is suppressed in STATE"