From 0df370cead7085eda47778cbb6046969e8bb19b0 Mon Sep 17 00:00:00 2001
From: Stephen Blott
Date: Fri, 30 Jan 2015 14:26:02 +0000
Subject: Visual/edit modes: fix bug entering visual mode from edit mode.

---
 content_scripts/mode_visual_edit.coffee | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/content_scripts/mode_visual_edit.coffee b/content_scripts/mode_visual_edit.coffee
index 9b39c523..4968fd7f 100644
--- a/content_scripts/mode_visual_edit.coffee
+++ b/content_scripts/mode_visual_edit.coffee
@@ -393,14 +393,15 @@ class VisualMode extends Movement
       exitOnEscape: true
     super extend defaults, options
 
-    if @options.parentMode and @selection.type == "Caret"
-      # We're being called from edit mode, so establish an intial visible selection.
-      @extendByOneCharacter(forward) or @extendByOneCharacter backward
-    else if @selection.type in [ "None", "Caret" ]
-      unless @options.oneMovementOnly or options.immediateMovement
-        HUD.showForDuration "No selection, entering caret mode first..", 2500
-        @changeMode CaretMode
-        return
+    unless @options.oneMovementOnly or options.immediateMovement
+      if @options.parentMode and @selection.type == "Caret"
+        # We're being called from edit mode, so establish an intial visible selection.
+        @extendByOneCharacter(forward) or @extendByOneCharacter backward
+      else if @selection.type in [ "None", "Caret" ]
+        unless @options.oneMovementOnly or options.immediateMovement
+          HUD.showForDuration "No selection, entering caret mode first..", 2500
+          @changeMode CaretMode
+          return
 
     # Yank on <Enter>.
     @push
-- 
cgit v1.2.3