1 files changed, 22 insertions, 15 deletions

diff --git a/src/nvim/normal.c b/src/nvim/normal.c
index f5607f3676..c95e5e1a15 100644
--- a/src/nvim/normal.c
+++ b/src/nvim/normal.c
@@ -974,7 +974,7 @@ static int normal_execute(VimState *state, int key)
   s->old_col = curwin->w_curswant;
   s->c = key;
 
-  LANGMAP_ADJUST(s->c, true);
+  LANGMAP_ADJUST(s->c, get_real_state() != SELECTMODE);
 
   // If a mapping was started in Visual or Select mode, remember the length
   // of the mapping.  This is used below to not return to Insert mode for as
@@ -1795,10 +1795,11 @@ void do_pending_operator(cmdarg_T *cap, int old_col, bool gui_yank)
       if (oap->line_count < 2)
         oap->line_count = 2;
       if (curwin->w_cursor.lnum + oap->line_count - 1 >
-          curbuf->b_ml.ml_line_count)
+          curbuf->b_ml.ml_line_count) {
         beep_flush();
-      else {
-        do_join(oap->line_count, oap->op_type == OP_JOIN, true, true, true);
+      } else {
+        do_join((size_t)oap->line_count, oap->op_type == OP_JOIN,
+                true, true, true);
         auto_format(false, true);
       }
       break;
@@ -7648,19 +7649,25 @@ static void nv_halfpage(cmdarg_T *cap)
  */
 static void nv_join(cmdarg_T *cap)
 {
-  if (VIsual_active)    /* join the visual lines */
+  if (VIsual_active) {  // join the visual lines
     nv_operator(cap);
-  else if (!checkclearop(cap->oap)) {
-    if (cap->count0 <= 1)
-      cap->count0 = 2;              /* default for join is two lines! */
+  } else if (!checkclearop(cap->oap)) {
+    if (cap->count0 <= 1) {
+      cap->count0 = 2;  // default for join is two lines!
+    }
     if (curwin->w_cursor.lnum + cap->count0 - 1 >
-        curbuf->b_ml.ml_line_count)
-      clearopbeep(cap->oap);        /* beyond last line */
-    else {
-      prep_redo(cap->oap->regname, cap->count0,
-          NUL, cap->cmdchar, NUL, NUL, cap->nchar);
-      do_join(cap->count0, cap->nchar == NUL, true, true, true);
+        curbuf->b_ml.ml_line_count) {
+      // can't join when on the last line
+      if (cap->count0 <= 2) {
+        clearopbeep(cap->oap);
+        return;
+      }
+      cap->count0 = curbuf->b_ml.ml_line_count - curwin->w_cursor.lnum + 1;
     }
+
+    prep_redo(cap->oap->regname, cap->count0,
+              NUL, cap->cmdchar, NUL, NUL, cap->nchar);
+    do_join((size_t)cap->count0, cap->nchar == NUL, true, true, true);
   }
 }
 
@@ -7873,7 +7880,7 @@ static void nv_event(cmdarg_T *cap)
   // not safe to perform garbage collection because there could be unreferenced
   // lists or dicts being used.
   may_garbage_collect = false;
-  queue_process_events(loop.events);
+  queue_process_events(main_loop.events);
   cap->retval |= CA_COMMAND_BUSY;       // don't call edit() now
 }