Merge remote-tracking branch 'vim/master'

Author: splhack

.gitignore

@@ -78,6 +78,7 @@ src/testdir/dostmp/*
 src/testdir/messages
 src/testdir/viminfo
 src/memfile_test
+src/json_test
 
 # From MacVim
 .*.swp

src/eval.c

@@ -11368,7 +11368,10 @@ f_feedkeys(typval_T *argvars, typval_T *rettv UNUSED)
 
 		/* Avoid a 1 second delay when the keys start Insert mode. */
 		msg_scroll = FALSE;
+
+		++ex_normal_busy;
 		exec_normal(TRUE);
+		--ex_normal_busy;
 		msg_scroll |= save_msg_scroll;
 	    }
 	}

src/ex_cmds2.c

@@ -3449,7 +3449,7 @@ add_pack_plugin(char_u *fname, void *cookie)
 
     if (load_files)
     {
-	static char *plugpat = "%s/plugin/*.vim";
+	static char *plugpat = "%s/plugin/**/*.vim";
 	static char *ftpat = "%s/ftdetect/*.vim";
 	int	    len;
 	char_u	    *pat;

src/ex_docmd.c

@@ -10067,6 +10067,7 @@ ex_stopinsert(exarg_T *eap UNUSED)
 {
     restart_edit = 0;
     stop_insert_mode = TRUE;
+    clearmode();
 }
 
 /*

src/gui_w32.c

@@ -2218,7 +2218,7 @@ gui_mch_wait_for_chars(int wtime)
 	    parse_queued_messages();
 
 	    if (pPeekMessage(&msg, NULL, 0, 0, PM_NOREMOVE)
-		|| MsgWaitForMultipleObjects(0, NULL, FALSE, 100, QS_ALLEVENTS)
+		|| MsgWaitForMultipleObjects(0, NULL, FALSE, 100, QS_ALLINPUT)
 								!= WAIT_TIMEOUT)
 		break;
 	}

src/if_perl.xs

@@ -52,7 +52,6 @@
 #ifdef __GNUC__
 # pragma GCC diagnostic push
 # pragma GCC diagnostic ignored "-Wunused-variable"
-# pragma GCC diagnostic ignored "-Wmaybe-uninitialized"
 #endif
 
 #include <EXTERN.h>
@@ -307,16 +306,18 @@ static void (*perl_free)(PerlInterpreter*);
 static int (*perl_run)(PerlInterpreter*);
 static int (*perl_parse)(PerlInterpreter*, XSINIT_t, int, char**, char**);
 static void* (*Perl_get_context)(void);
-static void (*Perl_croak)(pTHX_ const char*, ...);
+static void (*Perl_croak)(pTHX_ const char*, ...) __attribute__noreturn__;
 #ifdef PERL5101_OR_LATER
 /* Perl-5.18 has a different Perl_croak_xs_usage signature. */
 # if (PERL_REVISION == 5) && (PERL_VERSION >= 18)
-static void (*Perl_croak_xs_usage)(const CV *const, const char *const params);
+static void (*Perl_croak_xs_usage)(const CV *const, const char *const params)
+						    __attribute__noreturn__;
 # else
-static void (*Perl_croak_xs_usage)(pTHX_ const CV *const, const char *const params);
+static void (*Perl_croak_xs_usage)(pTHX_ const CV *const, const char *const params)
+						    __attribute__noreturn__;
 # endif
 #endif
-static void (*Perl_croak_nocontext)(const char*, ...);
+static void (*Perl_croak_nocontext)(const char*, ...) __attribute__noreturn__;
 static I32 (*Perl_dowantarray)(pTHX);
 static void (*Perl_free_tmps)(pTHX);
 static HV* (*Perl_gv_stashpv)(pTHX_ const char*, I32);
@@ -591,7 +592,9 @@ static struct {
  * "perl\lib\CORE\inline.h", after Perl_sv_free2 is defined.
  * The linker won't complain about undefined __impl_Perl_sv_free2. */
 #if (PERL_REVISION == 5) && (PERL_VERSION >= 18)
+# define PL_memory_wrap "panic: memory wrap" /* Dummy */
 # include <inline.h>
+# undef PL_memory_wrap
 #endif
 
 /*
@@ -1516,7 +1519,8 @@ SetHeight(win, height)
     curwin = savewin;
 
 void
-Cursor(VIWIN win, ...)
+Cursor(win, ...)
+    VIWIN win
 
     PPCODE:
     if (items == 1)