Mirror of the Vim source from https://github.com/vim/vim
Revision | 888c0645d64f3a844b22525387981f17317d8502 (tree) |
---|---|
Zeit | 2007-08-14 22:00:40 |
Autor | vimboss |
Commiter | vimboss |
updated for version 7.1-069
@@ -1630,11 +1630,14 @@ | ||
1630 | 1630 | */ |
1631 | 1631 | /*ARGSUSED*/ |
1632 | 1632 | static int |
1633 | -dlg_key_press_event(GtkWidget * widget, GdkEventKey * event, CancelData *data) | |
1633 | +dlg_key_press_event(GtkWidget *widget, GdkEventKey *event, CancelData *data) | |
1634 | 1634 | { |
1635 | - /* Ignore hitting Enter when there is no default button. */ | |
1636 | - if (data->ignore_enter && event->keyval == GDK_Return) | |
1635 | + /* Ignore hitting Enter (or Space) when there is no default button. */ | |
1636 | + if (data->ignore_enter && (event->keyval == GDK_Return | |
1637 | + || event->keyval == ' ')) | |
1637 | 1638 | return TRUE; |
1639 | + else /* A different key was pressed, return to normal behavior */ | |
1640 | + data->ignore_enter = FALSE; | |
1638 | 1641 | |
1639 | 1642 | if (event->keyval != GDK_Escape && event->keyval != GDK_Return) |
1640 | 1643 | return FALSE; |
@@ -2224,6 +2227,13 @@ | ||
2224 | 2227 | { |
2225 | 2228 | DialogInfo *di = (DialogInfo *)data; |
2226 | 2229 | |
2230 | + /* Ignore hitting Enter (or Space) when there is no default button. */ | |
2231 | + if (di->ignore_enter && (event->keyval == GDK_Return | |
2232 | + || event->keyval == ' ')) | |
2233 | + return TRUE; | |
2234 | + else /* A different key was pressed, return to normal behavior */ | |
2235 | + di->ignore_enter = FALSE; | |
2236 | + | |
2227 | 2237 | /* Close the dialog when hitting "Esc". */ |
2228 | 2238 | if (event->keyval == GDK_Escape) |
2229 | 2239 | { |
@@ -667,6 +667,8 @@ | ||
667 | 667 | static int included_patches[] = |
668 | 668 | { /* Add new patch number below this line */ |
669 | 669 | /**/ |
670 | + 69, | |
671 | +/**/ | |
670 | 672 | 68, |
671 | 673 | /**/ |
672 | 674 | 67, |