Merge remote-tracking branch 'vim/master'

splhack · splhack · commit b0501922f1d6 · 2016-08-10T19:08:32.000-07:00
diff --git a/src/gui.c b/src/gui.c
@@ -447,7 +447,7 @@ gui_init_check(void)
      * See gui_do_fork().
      * Use a simpler check if the GUI window can probably be opened.
      */
-    result = gui.dofork ? gui_mch_early_init_check() : gui_mch_init_check();
+    result = gui.dofork ? gui_mch_early_init_check(TRUE) : gui_mch_init_check();
 # else
     result = gui_mch_init_check();
 # endif
diff --git a/src/gui.h b/src/gui.h
@@ -16,7 +16,7 @@
 # include <X11/StringDefs.h>
 #endif
 
-#ifdef FEAT_BEVAL
+#if defined(FEAT_BEVAL) || defined(PROTO)
 # include "gui_beval.h"
 #endif
 
diff --git a/src/gui_gtk_x11.c b/src/gui_gtk_x11.c
@@ -542,8 +542,10 @@ gui_mch_prepare(int *argc, char **argv)
 	}
 
 	/* These arguments make gnome_program_init() print a message and exit.
-	 * Must start the GUI for this, otherwise ":gui" will exit later! */
-	if (option->flags & ARG_NEEDS_GUI)
+	 * Must start the GUI for this, otherwise ":gui" will exit later!
+	 * Only when the GUI can start. */
+	if ((option->flags & ARG_NEEDS_GUI)
+				      && gui_mch_early_init_check(FALSE) == OK)
 	    gui.starting = TRUE;
 
 	if (option->flags & ARG_KEEP)
@@ -1663,7 +1665,7 @@ selection_get_cb(GtkWidget	    *widget UNUSED,
  * Return OK or FAIL.
  */
     int
-gui_mch_early_init_check(void)
+gui_mch_early_init_check(int give_message)
 {
     char_u *p;
 
@@ -1672,7 +1674,8 @@ gui_mch_early_init_check(void)
     if (p == NULL || *p == NUL)
     {
 	gui.dying = TRUE;
-	EMSG(_((char *)e_opendisp));
+	if (give_message)
+	    EMSG(_((char *)e_opendisp));
 	return FAIL;
     }
     return OK;
diff --git a/src/gui_w32.c b/src/gui_w32.c
@@ -247,6 +247,7 @@ gui_mch_set_rendering_options(char_u *s)
 # define CONST
 # define FAR
 # define NEAR
+# undef _cdecl
 # define _cdecl
 typedef int BOOL;
 typedef int BYTE;
@@ -288,6 +289,7 @@ typedef void VOID;
 typedef int LPNMHDR;
 typedef int LONG;
 typedef int WNDPROC;
+typedef int UINT_PTR;
 #endif
 
 #ifndef GET_X_LPARAM
@@ -3451,7 +3453,7 @@ gui_mch_settitle(
     set_window_title(s_hwnd, (title == NULL ? "VIM" : (char *)title));
 }
 
-#ifdef FEAT_MOUSESHAPE
+#if defined(FEAT_MOUSESHAPE) || defined(PROTO)
 /* Table for shape IDCs.  Keep in sync with the mshape_names[] table in
  * misc2.c! */
 static LPCSTR mshape_idcs[] =
@@ -3514,7 +3516,7 @@ mch_set_mouse_shape(int shape)
 }
 #endif
 
-#ifdef FEAT_BROWSE
+#if defined(FEAT_BROWSE) || defined(PROTO)
 /*
  * The file browser exists in two versions: with "W" uses wide characters,
  * without "W" the current codepage.  When FEAT_MBYTE is defined and on
diff --git a/src/main.c b/src/main.c
@@ -436,6 +436,7 @@ main
 #endif
 }
 #endif /* NO_VIM_MAIN */
+#endif /* PROTO */
 
 /*
  * vim_main2() is needed for FEAT_MZSCHEME, but we define it always to keep
@@ -942,7 +943,6 @@ vim_main2(void)
 
     return 0;
 }
-#endif /* PROTO */
 
 /*
  * Initialisation shared by main() and some tests.
diff --git a/src/ops.c b/src/ops.c
@@ -6283,7 +6283,7 @@ write_viminfo_registers(FILE *fp)
  * 'permanent' of the two), otherwise the PRIMARY one.
  * For now, use a hard-coded sanity limit of 1Mb of data.
  */
-#if defined(FEAT_X11) && defined(FEAT_CLIPBOARD)
+#if (defined(FEAT_X11) && defined(FEAT_CLIPBOARD)) || defined(PROTO)
     void
 x11_export_final_selection(void)
 {
diff --git a/src/proto/fileio.pro b/src/proto/fileio.pro
@@ -33,7 +33,7 @@ void free_all_autocmds(void);
 int check_ei(void);
 char_u *au_event_disable(char *what);
 void au_event_restore(char_u *old_ei);
-void do_autocmd(char_u *arg, int forceit);
+void do_autocmd(char_u *arg_in, int forceit);
 int do_doautocmd(char_u *arg, int do_msg, int *did_something);
 void ex_doautoall(exarg_T *eap);
 int check_nomodeline(char_u **argp);
diff --git a/src/proto/gui_gtk_x11.pro b/src/proto/gui_gtk_x11.pro
@@ -6,7 +6,7 @@ int gui_mch_is_blink_off(void);
 void gui_mch_set_blinking(long waittime, long on, long off);
 void gui_mch_stop_blink(void);
 void gui_mch_start_blink(void);
-int gui_mch_early_init_check(void);
+int gui_mch_early_init_check(int give_message);
 int gui_mch_init_check(void);
 void gui_mch_show_tabline(int showit);
 int gui_mch_showing_tabline(void);
diff --git a/src/proto/main.pro b/src/proto/main.pro
@@ -1,5 +1,6 @@
 /* main.c */
-void common_init(mparm_T *params);
+int vim_main2(void);
+void common_init(mparm_T *paramp);
 void main_loop(int cmdwin, int noexmode);
 void getout_preserve_modified(int exitval);
 void getout(int exitval);
diff --git a/src/proto/message.pro b/src/proto/message.pro
@@ -4,7 +4,7 @@ int verb_msg(char_u *s);
 int msg_attr(char_u *s, int attr);
 int msg_attr_keep(char_u *s, int attr, int keep);
 char_u *msg_strtrunc(char_u *s, int force);
-void trunc_string(char_u *s, char_u *buf, int room, int buflen);
+void trunc_string(char_u *s, char_u *buf, int room_in, int buflen);
 void reset_last_sourcing(void);
 void msg_source(int attr);
 int emsg_not_now(void);
diff --git a/src/proto/normal.pro b/src/proto/normal.pro
@@ -16,7 +16,7 @@ void push_showcmd(void);
 void pop_showcmd(void);
 void do_check_scrollbind(int check);
 void check_scrollbind(linenr_T topline_diff, long leftcol_diff);
-int find_decl(char_u *ptr, int len, int locally, int thisblock, int searchflags);
+int find_decl(char_u *ptr, int len, int locally, int thisblock, int flags_arg);
 void scroll_redraw(int up, long count);
 void handle_tabmenu(void);
 void do_nv_ident(int c1, int c2);
diff --git a/src/proto/ops.pro b/src/proto/ops.pro
@@ -47,7 +47,7 @@ void op_addsub(oparg_T *oap, linenr_T Prenum1, int g_cmd);
 void prepare_viminfo_registers(void);
 void finish_viminfo_registers(void);
 int read_viminfo_register(vir_T *virp, int force);
-void handle_viminfo_register(garray_T *values, int writing);
+void handle_viminfo_register(garray_T *values, int force);
 void write_viminfo_registers(FILE *fp);
 void x11_export_final_selection(void);
 void clip_free_selection(VimClipboard *cbd);
diff --git a/src/testdir/test_glob2regpat.vim b/src/testdir/test_glob2regpat.vim
@@ -16,11 +16,15 @@ func Test_valid()
   call assert_equal('^\(foo\|bar\)$', glob2regpat('{foo,bar}'))
   call assert_equal('.*', glob2regpat('**'))
 
-  if has('unix')
+  if exists('+shellslash')
+    call assert_equal('^foo[\/].$', glob2regpat('foo\?'))
+    call assert_equal('^\(foo[\/]\|bar\|foobar\)$', glob2regpat('{foo\,bar,foobar}'))
+    call assert_equal('^[\/]\(foo\|bar[\/]\)$', glob2regpat('\{foo,bar\}'))
+    call assert_equal('^[\/][\/]\(foo\|bar[\/][\/]\)$', glob2regpat('\\{foo,bar\\}'))
+  else
     call assert_equal('^foo?$', glob2regpat('foo\?'))
     call assert_equal('^\(foo,bar\|foobar\)$', glob2regpat('{foo\,bar,foobar}'))
     call assert_equal('^{foo,bar}$', glob2regpat('\{foo,bar\}'))
     call assert_equal('^\\\(foo\|bar\\\)$', glob2regpat('\\{foo,bar\\}'))
-  " todo: Windows
   endif
 endfunc
diff --git a/src/testdir/test_signs.vim b/src/testdir/test_signs.vim
@@ -8,36 +8,71 @@ func Test_sign()
   new
   call setline(1, ['a', 'b', 'c', 'd'])
 
+  " Define some signs.
+  " We can specify icons even if not all versions of vim support icons as
+  " icon is ignored when not supported.  "(not supported)" is shown after
+  " the icon name when listing signs.
   sign define Sign1 text=x
-  sign define Sign2 text=y
+  try
+    sign define Sign2 text=xy texthl=Title linehl=Error icon=../../pixmaps/stock_vim_find_help.png
+  catch /E255:/
+    " ignore error: E255: Couldn't read in sign data!
+    " This error can happen when running in gui.
+    " Some gui like Motif do not support the png icon format.
+  endtry
 
   " Test listing signs.
   let a=execute('sign list')
-  call assert_equal("\nsign Sign1 text=x \nsign Sign2 text=y ", a)
+  call assert_match("^\nsign Sign1 text=x \nsign Sign2 icon=../../pixmaps/stock_vim_find_help.png .*text=xy linehl=Error texthl=Title$", a)
 
   let a=execute('sign list Sign1')
   call assert_equal("\nsign Sign1 text=x ", a)
 
-  " Place the sign at line 3,then check that we can jump to it.
-  exe 'sign place 42 line=3 name=Sign1 buffer=' . bufnr('')
+  " Split the window to the bottom to verify sign jump will stay in the current window
+  " if the buffer is displayed there.
+  let bn = bufnr('%')
+  let wn = winnr()
+  exe 'sign place 41 line=3 name=Sign1 buffer=' . bn 
+  1
+  bot split
+  exe 'sign jump 41 buffer=' . bufnr('%')
+  call assert_equal('c', getline('.'))
+  call assert_equal(3, winnr())
+  call assert_equal(bn, bufnr('%'))
+  call assert_notequal(wn, winnr())
+
+  " Create a new buffer and check that ":sign jump" switches to the old buffer.
   1
-  exe 'sign jump 42 buffer=' . bufnr('')
+  new foo
+  call assert_notequal(bn, bufnr('%'))
+  exe 'sign jump 41 buffer=' . bn
+  call assert_equal(bn, bufnr('%'))
   call assert_equal('c', getline('.'))
 
-  " Can't change sign.
-  call assert_fails("exe 'sign place 43 name=Sign1 buffer=' . bufnr('')", 'E885:')
+  " Redraw to make sure that screen redraw with sign gets exercised,
+  " with and without 'rightleft'.
+  if has('rightleft')
+    set rightleft
+    redraw
+    set norightleft
+  endif
+  redraw
 
+  " Check that we can't change sign.
+  call assert_fails("exe 'sign place 40 name=Sign1 buffer=' . bufnr('%')", 'E885:')
+
+  " Check placed signs
   let a=execute('sign place')
-  call assert_equal("\n--- Signs ---\nSigns for [NULL]:\n    line=3  id=42  name=Sign1\n", a)
+  call assert_equal("\n--- Signs ---\nSigns for [NULL]:\n    line=3  id=41  name=Sign1\n", a)
 
-  " Unplace the sign and try jumping to it again should now fail.
-  sign unplace 42
+  " Unplace the sign and try jumping to it again should fail.
+  sign unplace 41
   1
-  call assert_fails("exe 'sign jump 42 buffer=' . bufnr('')", 'E157:')
+  call assert_fails("exe 'sign jump 41 buffer=' . bufnr('%')", 'E157:')
   call assert_equal('a', getline('.'))
 
   " Unplace sign on current line.
-  exe 'sign place 43 line=4 name=Sign2 buffer=' . bufnr('')
+  exe 'sign place 42 line=4 name=Sign2 buffer=' . bufnr('%')
   4
   sign unplace
   let a=execute('sign place')
@@ -47,16 +82,54 @@ func Test_sign()
   call assert_fails('sign unplace', 'E159:')
 
   " Unplace all signs.
-  exe 'sign place 42 line=3 name=Sign1 buffer=' . bufnr('')
+  exe 'sign place 41 line=3 name=Sign1 buffer=' . bufnr('%')
   sign unplace *
   let a=execute('sign place')
   call assert_equal("\n--- Signs ---\n", a)
 
+  " Check :jump with file=...
+  edit foo
+  call setline(1, ['A', 'B', 'C', 'D'])
+
+  try
+    sign define Sign3 text=y texthl=DoesNotExist linehl=DoesNotExist icon=doesnotexist.xpm
+  catch /E255:/
+    " ignore error: E255: it can happens for guis.
+  endtry
+
+  let fn = expand('%:p')
+  exe 'sign place 43 line=2 name=Sign3 file=' . fn
+  edit bar
+  call assert_notequal(fn, expand('%:p'))
+  exe 'sign jump 43 file=' . fn
+  call assert_equal('B', getline('.'))
+
   " After undefining the sign, we should no longer be able to place it.
   sign undefine Sign1
   sign undefine Sign2
-  call assert_fails("exe 'sign place 42 line=3 name=Sign1 buffer=' . bufnr('')", 'E155:')
+  sign undefine Sign3
+  call assert_fails("exe 'sign place 41 line=3 name=Sign1 buffer=' . bufnr('%')", 'E155:')
+endfunc
+
+" Undefining placed sign is not recommended.
+" Quoting :help sign
+"
+" :sign undefine {name}
+"                Deletes a previously defined sign.  If signs with this {name}
+"                are still placed this will cause trouble.
+func Test_sign_undefine_still_placed()
+  new foobar
+  sign define Sign text=x
+  exe 'sign place 41 line=1 name=Sign buffer=' . bufnr('%')
+  sign undefine Sign
+
+  " Listing placed sign should show that sign is deleted.
+  let a=execute('sign place')
+  call assert_equal("\n--- Signs ---\nSigns for foobar:\n    line=1  id=41  name=[Deleted]\n", a)
 
+  sign unplace 41
+  let a=execute('sign place')
+  call assert_equal("\n--- Signs ---\n", a)
 endfunc
 
 func Test_sign_completion()
@@ -72,6 +145,9 @@ func Test_sign_completion()
   call feedkeys(":sign define Sign linehl=Spell\<C-A>\<C-B>\"\<CR>", 'tx')
   call assert_equal('"sign define Sign linehl=SpellBad SpellCap SpellLocal SpellRare', @:)
 
+  call feedkeys(":sign define Sign icon=../../pixmaps/tb_p\<C-A>\<C-B>\"\<CR>", 'tx')
+  call assert_equal('"sign define Sign icon=../../pixmaps/tb_paste.xpm ../../pixmaps/tb_print.xpm', @:)
+
   call feedkeys(":sign undefine \<C-A>\<C-B>\"\<CR>", 'tx')
   call assert_equal('"sign undefine Sign1 Sign2', @:)
 
@@ -92,13 +168,14 @@ func Test_sign_completion()
 
   sign undefine Sign1
   sign undefine Sign2
-
 endfunc
 
 func Test_sign_invalid_commands()
   call assert_fails('sign', 'E471:')
+  call assert_fails('sign jump', 'E471:')
   call assert_fails('sign xxx', 'E160:')
   call assert_fails('sign define', 'E156:')
+  call assert_fails('sign define Sign1 xxx', 'E475:')
   call assert_fails('sign undefine', 'E156:')
   call assert_fails('sign list xxx', 'E155:')
   call assert_fails('sign place 1 buffer=', 'E158:')
diff --git a/src/version.c b/src/version.c
@@ -778,6 +778,18 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    2196,
+/**/
+    2195,
+/**/
+    2194,
+/**/
+    2193,
+/**/
+    2192,
+/**/
+    2191,
 /**/
     2190,
 /**/
diff --git a/src/vim.h b/src/vim.h
@@ -2112,7 +2112,7 @@ typedef enum
  * been seen at that stage.  But it must be before globals.h, where error_ga
  * is declared. */
 #if !defined(FEAT_GUI_W32) && !defined(FEAT_GUI_X11) \
-	&& !defined(FEAT_GUI_GTK) && !defined(FEAT_GUI_MAC)
+	&& !defined(FEAT_GUI_GTK) && !defined(FEAT_GUI_MAC) && !defined(PROTO)
 # define mch_errmsg(str)	fprintf(stderr, "%s", (str))
 # define display_errors()	fflush(stderr)
 # define mch_msg(str)		printf("%s", (str))
@@ -2443,9 +2443,6 @@ typedef enum
 #define JSON_JS		1   /* use JS instead of JSON */
 #define JSON_NO_NONE	2   /* v:none item not allowed */
 
-/* This is in main.c, cproto can't handle it. */
-int vim_main2(void);
-
 /* Used for flags of do_in_path() */
 #define DIP_ALL	    0x01	/* all matches, not just the first one */
 #define DIP_DIR	    0x02	/* find directories instead of files. */
diff --git a/src/vimrun.c b/src/vimrun.c

Original file line number	Diff line number	Diff line change
`@@ -436,6 +436,7 @@ main`
`436`	`436`	`#endif`
`437`	`437`	`}`
`438`	`438`	`#endif /* NO_VIM_MAIN */`
	`439`	`+#endif /* PROTO */`
`439`	`440`
`440`	`441`	`/*`
`441`	`442`	`* vim_main2() is needed for FEAT_MZSCHEME, but we define it always to keep`
`@@ -942,7 +943,6 @@ vim_main2(void)`
`942`	`943`
`943`	`944`	`return 0;`
`944`	`945`	`}`
`945`		`-#endif /* PROTO */`
`946`	`946`
`947`	`947`	`/*`
`948`	`948`	`* Initialisation shared by main() and some tests.`
Original file line number	Diff line number	Diff line change
`@@ -6283,7 +6283,7 @@ write_viminfo_registers(FILE *fp)`
`6283`	`6283`	`* 'permanent' of the two), otherwise the PRIMARY one.`
`6284`	`6284`	`* For now, use a hard-coded sanity limit of 1Mb of data.`
`6285`	`6285`	`*/`
`6286`		`-#if defined(FEAT_X11) && defined(FEAT_CLIPBOARD)`
	`6286`	`+#if (defined(FEAT_X11) && defined(FEAT_CLIPBOARD)) \|\| defined(PROTO)`
`6287`	`6287`	`void`
`6288`	`6288`	`x11_export_final_selection(void)`
`6289`	`6289`	`{`