1
0
forked from aniani/vim

updated for version 7.1-069

This commit is contained in:
Bram Moolenaar 2007-08-14 13:00:40 +00:00
parent 67f7131efa
commit d2c765e688
2 changed files with 15 additions and 3 deletions

View File

@ -1630,11 +1630,14 @@ dlg_button_clicked(GtkWidget * widget, ButtonData *data)
*/ */
/*ARGSUSED*/ /*ARGSUSED*/
static int static int
dlg_key_press_event(GtkWidget * widget, GdkEventKey * event, CancelData *data) dlg_key_press_event(GtkWidget *widget, GdkEventKey *event, CancelData *data)
{ {
/* Ignore hitting Enter when there is no default button. */ /* Ignore hitting Enter (or Space) when there is no default button. */
if (data->ignore_enter && event->keyval == GDK_Return) if (data->ignore_enter && (event->keyval == GDK_Return
|| event->keyval == ' '))
return TRUE; return TRUE;
else /* A different key was pressed, return to normal behavior */
data->ignore_enter = FALSE;
if (event->keyval != GDK_Escape && event->keyval != GDK_Return) if (event->keyval != GDK_Escape && event->keyval != GDK_Return)
return FALSE; return FALSE;
@ -2224,6 +2227,13 @@ dialog_key_press_event_cb(GtkWidget *widget, GdkEventKey *event, gpointer data)
{ {
DialogInfo *di = (DialogInfo *)data; DialogInfo *di = (DialogInfo *)data;
/* Ignore hitting Enter (or Space) when there is no default button. */
if (di->ignore_enter && (event->keyval == GDK_Return
|| event->keyval == ' '))
return TRUE;
else /* A different key was pressed, return to normal behavior */
di->ignore_enter = FALSE;
/* Close the dialog when hitting "Esc". */ /* Close the dialog when hitting "Esc". */
if (event->keyval == GDK_Escape) if (event->keyval == GDK_Escape)
{ {

View File

@ -666,6 +666,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
69,
/**/ /**/
68, 68,
/**/ /**/