]> granicus.if.org Git - vim/commitdiff
updated for version 7.0-072 v7.0.072
authorBram Moolenaar <Bram@vim.org>
Tue, 29 Aug 2006 16:13:22 +0000 (16:13 +0000)
committerBram Moolenaar <Bram@vim.org>
Tue, 29 Aug 2006 16:13:22 +0000 (16:13 +0000)
src/fileio.c
src/gui.c
src/version.c
src/vim.h

index cde44d6a80ae8a70dd17b07366fdde5478878a9c..4ef21fe4018f55976d6296e75f8b36499e096718 100644 (file)
@@ -6980,6 +6980,7 @@ static struct event_name
     {"FocusLost",      EVENT_FOCUSLOST},
     {"FuncUndefined",  EVENT_FUNCUNDEFINED},
     {"GUIEnter",       EVENT_GUIENTER},
+    {"GUIFailed",      EVENT_GUIFAILED},
     {"InsertChange",   EVENT_INSERTCHANGE},
     {"InsertEnter",    EVENT_INSERTENTER},
     {"InsertLeave",    EVENT_INSERTLEAVE},
index cf121cfaca8920ed53d6cfe1142653706916cf6a..02a14b90d1572d97df22ab036bec434b4633f795 100644 (file)
--- a/src/gui.c
+++ b/src/gui.c
@@ -187,9 +187,10 @@ gui_start()
 #endif
 
 #ifdef FEAT_AUTOCMD
-    /* If the GUI started successfully, trigger the GUIEnter event */
-    if (gui.in_use)
-       apply_autocmds(EVENT_GUIENTER, NULL, NULL, FALSE, curbuf);
+    /* If the GUI started successfully, trigger the GUIEnter event, otherwise
+     * the GUIFailed event. */
+    apply_autocmds(gui.in_use ? EVENT_GUIENTER : EVENT_GUIFAILED,
+                                                  NULL, NULL, FALSE, curbuf);
 #endif
 
     --recursive;
index 35c6c563005fc467fc11c24605c3743edacb23e3..649290ef682d66eea492b2174ebde77b37822829 100644 (file)
@@ -666,6 +666,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    72,
 /**/
     71,
 /**/
index b7ed480e6ed2228f766b46148be8d3de850c0250..c8ec443c4ecd579162725ff4ff65902e87e44616 100644 (file)
--- a/src/vim.h
+++ b/src/vim.h
@@ -1120,6 +1120,7 @@ enum auto_event
     EVENT_FOCUSGAINED,         /* got the focus */
     EVENT_FOCUSLOST,           /* lost the focus to another app */
     EVENT_GUIENTER,            /* after starting the GUI */
+    EVENT_GUIFAILED,           /* after starting the GUI failed */
     EVENT_INSERTCHANGE,                /* when changing Insert/Replace mode */
     EVENT_INSERTENTER,         /* when entering Insert mode */
     EVENT_INSERTLEAVE,         /* when leaving Insert mode */