commit 714db3bb819bb7f9f52270f2352b274bba3a9ff4
author Bram Moolenaar <Bram@vim.org> Fri Sep 19 13:46:52 2014 +0200
committer Bram Moolenaar <Bram@vim.org> Fri Sep 19 13:46:52 2014 +0200
tree bdde3d8e31273b35691691c11b28c1c86f77f927
parent 103650de9083ba5451869a3f8ed729ba47746b3a

updated for version 7.4.445
Problem:    Clipboard may be cleared on startup.
Solution:   Set clip_did_set_selection to -1 during startup. (Christian
            Brabandt)

src/main.c

diff --git a/src/main.c b/src/main.c
index 73f6697..fe75495 100644
--- a/src/main.c
+++ b/src/main.c
@@ -958,8 +958,17 @@
     if (p_im)
 	need_start_insertmode = TRUE;
 
+#ifdef FEAT_CLIPBOARD
+    if (clip_unnamed)
+       /* do not overwrite system clipboard while starting up */
+       clip_did_set_selection = -1;
+#endif
 #ifdef FEAT_AUTOCMD
     apply_autocmds(EVENT_VIMENTER, NULL, NULL, FALSE, curbuf);
+# ifdef FEAT_CLIPBOARD
+    if (clip_did_set_selection < 0)
+       clip_did_set_selection = TRUE;
+# endif
     TIME_MSG("VimEnter autocommands");
 #endif
 

src/ui.c

diff --git a/src/ui.c b/src/ui.c
index 21d92f0..b268cd7 100644
--- a/src/ui.c
+++ b/src/ui.c
@@ -571,7 +571,7 @@
 {
     clip_unnamed_saved = clip_unnamed;
 
-    if (clip_did_set_selection)
+    if (clip_did_set_selection > 0)
     {
 	clip_unnamed = FALSE;
 	clip_did_set_selection = FALSE;
@@ -584,7 +584,7 @@
     void
 end_global_changes()
 {
-    if (!clip_did_set_selection)
+    if (clip_did_set_selection == FALSE)  /* not when -1 */
     {
 	clip_did_set_selection = TRUE;
 	clip_unnamed = clip_unnamed_saved;

src/version.c

diff --git a/src/version.c b/src/version.c
index a66046a..adff6db 100644
--- a/src/version.c
+++ b/src/version.c
@@ -742,6 +742,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    445,
+/**/
     444,
 /**/
     443,