aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-09-07 22:03:36 -04:00
Code

updated for version 7.4.445

Browse Source 
Problem:    Clipboard may be cleared on startup.
Solution:   Set clip_did_set_selection to -1 during startup. (Christian
            Brabandt)
This commit is contained in:
Bram Moolenaar 2014-09-19 13:46:52 +02:00
parent 103650de90
commit 714db3bb81
3 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/main.c
View File

@ -958,8 +958,17 @@ vim_main2(int argc UNUSED, char **argv UNUSED)
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

4
src/ui.c
View File

@ -571,7 +571,7 @@ start_global_changes()
{
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 @@ start_global_changes()
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;

2
src/version.c
View File

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