• R/O
  • SSH

vim: Commit

Mirror of the Vim source from https://github.com/vim/vim


Commit MetaInfo

Revision888c0645d64f3a844b22525387981f17317d8502 (tree)
Zeit2007-08-14 22:00:40
Autorvimboss
Commitervimboss

Log Message

updated for version 7.1-069

Ändern Zusammenfassung

Diff

diff -r 10a1b67c0885 -r 888c0645d64f src/gui_gtk.c
--- a/src/gui_gtk.c Sun Aug 12 14:55:56 2007 +0000
+++ b/src/gui_gtk.c Tue Aug 14 13:00:40 2007 +0000
@@ -1630,11 +1630,14 @@
16301630 */
16311631 /*ARGSUSED*/
16321632 static int
1633-dlg_key_press_event(GtkWidget * widget, GdkEventKey * event, CancelData *data)
1633+dlg_key_press_event(GtkWidget *widget, GdkEventKey *event, CancelData *data)
16341634 {
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 == ' '))
16371638 return TRUE;
1639+ else /* A different key was pressed, return to normal behavior */
1640+ data->ignore_enter = FALSE;
16381641
16391642 if (event->keyval != GDK_Escape && event->keyval != GDK_Return)
16401643 return FALSE;
@@ -2224,6 +2227,13 @@
22242227 {
22252228 DialogInfo *di = (DialogInfo *)data;
22262229
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+
22272237 /* Close the dialog when hitting "Esc". */
22282238 if (event->keyval == GDK_Escape)
22292239 {
diff -r 10a1b67c0885 -r 888c0645d64f src/version.c
--- a/src/version.c Sun Aug 12 14:55:56 2007 +0000
+++ b/src/version.c Tue Aug 14 13:00:40 2007 +0000
@@ -667,6 +667,8 @@
667667 static int included_patches[] =
668668 { /* Add new patch number below this line */
669669 /**/
670+ 69,
671+/**/
670672 68,
671673 /**/
672674 67,
Show on old repository browser