1 files changed, 13 insertions, 62 deletions

diff --git a/src/nvim/ex_docmd.c b/src/nvim/ex_docmd.c
index a9262ca6ea..59bda9345e 100644
--- a/src/nvim/ex_docmd.c
+++ b/src/nvim/ex_docmd.c
@@ -1,12 +1,4 @@
 /*
- * VIM - Vi IMproved	by Bram Moolenaar
- *
- * Do ":help uganda"  in Vim to read copying and usage conditions.
- * Do ":help credits" in Vim to see a list of people who contributed.
- * See README.txt for an overview of the Vim source code.
- */
-
-/*
  * ex_docmd.c: functions for executing an Ex command line.
  */
 
@@ -14,7 +6,6 @@
 #include <string.h>
 #include <stdbool.h>
 #include <stdint.h>
-#include <errno.h>
 #include <inttypes.h>
 
 #include "nvim/vim.h"
@@ -80,6 +71,9 @@
 static int quitmore = 0;
 static int ex_pressedreturn = FALSE;
 
+/* whether ":lcd" was produced for a session */
+static int did_lcd;
+
 typedef struct ucmd {
   char_u      *uc_name;         /* The command name */
   uint32_t uc_argt;             /* The argument type */
@@ -144,23 +138,9 @@ struct dbg_stuff {
 # include "ex_docmd.c.generated.h"
 #endif
 
-# define ex_gui                 ex_nogui
-# define ex_popup               ex_ni
-# define ex_simalt              ex_ni
-# define gui_mch_find_dialog    ex_ni
-# define gui_mch_replace_dialog ex_ni
-# define ex_helpfind            ex_ni
-static int did_lcd;             /* whether ":lcd" was produced for a session */
 #ifndef HAVE_WORKING_LIBINTL
 # define ex_language            ex_ni
 #endif
-# define ex_wsverb              ex_ni
-# define ex_nbclose             ex_ni
-# define ex_nbkey               ex_ni
-# define ex_nbstart             ex_ni
-
-
-
 
 /*
  * Declare cmdnames[].
@@ -3466,6 +3446,7 @@ static linenr_T get_address(char_u **ptr,
       }
       if (addr_type != ADDR_LINES) {
         EMSG(_(e_invaddr));
+        cmd = NULL;
         goto error;
       }
       if (skip)
@@ -3493,6 +3474,7 @@ static linenr_T get_address(char_u **ptr,
       c = *cmd++;
       if (addr_type != ADDR_LINES) {
         EMSG(_(e_invaddr));
+        cmd = NULL;
         goto error;
       }
       if (skip) {                       /* skip "/pat/" */
@@ -3536,6 +3518,7 @@ static linenr_T get_address(char_u **ptr,
       ++cmd;
       if (addr_type != ADDR_LINES) {
         EMSG(_(e_invaddr));
+        cmd = NULL;
         goto error;
       }
       if (*cmd == '&')
@@ -3607,7 +3590,8 @@ static linenr_T get_address(char_u **ptr,
       else
         n = getdigits(&cmd);
       if (addr_type == ADDR_LOADED_BUFFERS || addr_type == ADDR_BUFFERS)
-        lnum = compute_buffer_local_count(addr_type, lnum, (i == '-') ? -1 * n : n);
+        lnum = compute_buffer_local_count(
+            addr_type, lnum, (i == '-') ? -1 * n : n);
       else if (i == '-')
         lnum -= n;
       else
@@ -3675,7 +3659,8 @@ static char_u *invalid_range(exarg_T *eap)
         }
         break;
       case ADDR_ARGUMENTS:
-        if (eap->line2 > ARGCOUNT + (!ARGCOUNT)) {  // add 1 if ARGCOUNT is 0
+        // add 1 if ARGCOUNT is 0
+        if (eap->line2 > ARGCOUNT + (!ARGCOUNT)) {
           return (char_u *)_(e_invrange);
         }
         break;
@@ -6467,40 +6452,6 @@ static void ex_find(exarg_T *eap)
 }
 
 /*
- * ":open" simulation: for now just work like ":visual".
- */
-static void ex_open(exarg_T *eap)
-{
-  regmatch_T regmatch;
-  char_u      *p;
-
-  curwin->w_cursor.lnum = eap->line2;
-  beginline(BL_SOL | BL_FIX);
-  if (*eap->arg == '/') {
-    /* ":open /pattern/": put cursor in column found with pattern */
-    ++eap->arg;
-    p = skip_regexp(eap->arg, '/', p_magic, NULL);
-    *p = NUL;
-    regmatch.regprog = vim_regcomp(eap->arg, p_magic ? RE_MAGIC : 0);
-    if (regmatch.regprog != NULL) {
-      regmatch.rm_ic = p_ic;
-      p = get_cursor_line_ptr();
-      if (vim_regexec(&regmatch, p, (colnr_T)0))
-        curwin->w_cursor.col = (colnr_T)(regmatch.startp[0] - p);
-      else
-        EMSG(_(e_nomatch));
-      vim_regfree(regmatch.regprog);
-    }
-    /* Move to the NUL, ignore any other arguments. */
-    eap->arg += STRLEN(eap->arg);
-  }
-  check_cursor();
-
-  eap->cmdidx = CMD_visual;
-  do_exedit(eap, NULL);
-}
-
-/*
  * ":edit", ":badd", ":visual".
  */
 static void ex_edit(exarg_T *eap)
@@ -6544,7 +6495,7 @@ do_exedit (
         msg_scroll = 0;
         must_redraw = CLEAR;
 
-        main_loop(FALSE, TRUE);
+        normal_enter(false, true);
 
         RedrawingDisabled = rd;
         no_wait_return = nwr;
@@ -7193,7 +7144,7 @@ static void ex_wundo(exarg_T *eap)
   char_u hash[UNDO_HASH_SIZE];
 
   u_compute_hash(hash);
-  u_write_undo(eap->arg, eap->forceit, curbuf, hash);
+  u_write_undo((char *) eap->arg, eap->forceit, curbuf, hash);
 }
 
 static void ex_rundo(exarg_T *eap)
@@ -7201,7 +7152,7 @@ static void ex_rundo(exarg_T *eap)
   char_u hash[UNDO_HASH_SIZE];
 
   u_compute_hash(hash);
-  u_read_undo(eap->arg, hash, NULL);
+  u_read_undo((char *) eap->arg, hash, NULL);
 }
 
 /*