summaryrefslogtreecommitdiff
path: root/src/ui.c
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2005-05-31 22:22:17 +0000
committerBram Moolenaar <Bram@vim.org>2005-05-31 22:22:17 +0000
commit54ee775e9d147f8751f38b39e22b1e0b6b9e445d (patch)
treebf6a49e78703aba9a0e8da498485d6c2ffa15e48 /src/ui.c
parent5c06f8b043e413d887ceb1af850ac7ba5034151e (diff)
downloadvim-git-54ee775e9d147f8751f38b39e22b1e0b6b9e445d.tar.gz
updated for version 7.0077v7.0077
Diffstat (limited to 'src/ui.c')
-rw-r--r--src/ui.c10
1 files changed, 8 insertions, 2 deletions
diff --git a/src/ui.c b/src/ui.c
index 3506c48b8..89b5cd689 100644
--- a/src/ui.c
+++ b/src/ui.c
@@ -1696,7 +1696,13 @@ fill_input_buf(exit_on_error)
#endif
#ifdef FEAT_GUI
- if (gui.in_use)
+ if (gui.in_use
+# ifdef NO_CONSOLE_INPUT
+ /* Don't use the GUI input when the window hasn't been opened yet.
+ * We get here from ui_inchar() when we should try reading from stdin. */
+ && !no_console_input()
+# endif
+ )
{
gui_mch_update();
return;
@@ -2140,7 +2146,7 @@ clip_x11_request_selection(myShell, dpy, cbd)
clip_yank_selection(MCHAR, buffer, (long)nbytes, cbd);
XFree((void *)buffer);
if (p_verbose > 0)
- MSG(_("Used CUT_BUFFER0 instead of empty selection"));
+ verb_msg((char_u *)_("Used CUT_BUFFER0 instead of empty selection"));
}
}