|
@@ -0,0 +1,92 @@
|
|
|
1
|
+
To: vim_dev@googlegroups.com
|
|
2
|
+
Subject: Patch 7.4.445
|
|
3
|
+
Fcc: outbox
|
|
4
|
+
From: Bram Moolenaar <Bram@moolenaar.net>
|
|
5
|
+
Mime-Version: 1.0
|
|
6
|
+
Content-Type: text/plain; charset=UTF-8
|
|
7
|
+
Content-Transfer-Encoding: 8bit
|
|
8
|
+
------------
|
|
9
|
+
|
|
10
|
+
Patch 7.4.445
|
|
11
|
+
Problem: Clipboard may be cleared on startup.
|
|
12
|
+
Solution: Set clip_did_set_selection to -1 during startup. (Christian
|
|
13
|
+
Brabandt)
|
|
14
|
+
Files: src/main.c, src/ui.c
|
|
15
|
+
|
|
16
|
+
|
|
17
|
+
*** ../vim-7.4.444/src/main.c 2014-09-09 17:47:34.584544079 +0200
|
|
18
|
+
--- src/main.c 2014-09-19 13:38:29.802398710 +0200
|
|
19
|
+
***************
|
|
20
|
+
*** 958,965 ****
|
|
21
|
+
--- 958,974 ----
|
|
22
|
+
if (p_im)
|
|
23
|
+
need_start_insertmode = TRUE;
|
|
24
|
+
|
|
25
|
+
+ #ifdef FEAT_CLIPBOARD
|
|
26
|
+
+ if (clip_unnamed)
|
|
27
|
+
+ /* do not overwrite system clipboard while starting up */
|
|
28
|
+
+ clip_did_set_selection = -1;
|
|
29
|
+
+ #endif
|
|
30
|
+
#ifdef FEAT_AUTOCMD
|
|
31
|
+
apply_autocmds(EVENT_VIMENTER, NULL, NULL, FALSE, curbuf);
|
|
32
|
+
+ # ifdef FEAT_CLIPBOARD
|
|
33
|
+
+ if (clip_did_set_selection < 0)
|
|
34
|
+
+ clip_did_set_selection = TRUE;
|
|
35
|
+
+ # endif
|
|
36
|
+
TIME_MSG("VimEnter autocommands");
|
|
37
|
+
#endif
|
|
38
|
+
|
|
39
|
+
*** ../vim-7.4.444/src/ui.c 2014-08-06 18:17:03.475147780 +0200
|
|
40
|
+
--- src/ui.c 2014-09-19 13:39:48.442398882 +0200
|
|
41
|
+
***************
|
|
42
|
+
*** 571,577 ****
|
|
43
|
+
{
|
|
44
|
+
clip_unnamed_saved = clip_unnamed;
|
|
45
|
+
|
|
46
|
+
! if (clip_did_set_selection)
|
|
47
|
+
{
|
|
48
|
+
clip_unnamed = FALSE;
|
|
49
|
+
clip_did_set_selection = FALSE;
|
|
50
|
+
--- 571,577 ----
|
|
51
|
+
{
|
|
52
|
+
clip_unnamed_saved = clip_unnamed;
|
|
53
|
+
|
|
54
|
+
! if (clip_did_set_selection > 0)
|
|
55
|
+
{
|
|
56
|
+
clip_unnamed = FALSE;
|
|
57
|
+
clip_did_set_selection = FALSE;
|
|
58
|
+
***************
|
|
59
|
+
*** 584,590 ****
|
|
60
|
+
void
|
|
61
|
+
end_global_changes()
|
|
62
|
+
{
|
|
63
|
+
! if (!clip_did_set_selection)
|
|
64
|
+
{
|
|
65
|
+
clip_did_set_selection = TRUE;
|
|
66
|
+
clip_unnamed = clip_unnamed_saved;
|
|
67
|
+
--- 584,590 ----
|
|
68
|
+
void
|
|
69
|
+
end_global_changes()
|
|
70
|
+
{
|
|
71
|
+
! if (clip_did_set_selection == FALSE) /* not when -1 */
|
|
72
|
+
{
|
|
73
|
+
clip_did_set_selection = TRUE;
|
|
74
|
+
clip_unnamed = clip_unnamed_saved;
|
|
75
|
+
*** ../vim-7.4.444/src/version.c 2014-09-15 14:25:51.309650006 +0200
|
|
76
|
+
--- src/version.c 2014-09-19 13:35:30.618398318 +0200
|
|
77
|
+
***************
|
|
78
|
+
*** 743,744 ****
|
|
79
|
+
--- 743,746 ----
|
|
80
|
+
{ /* Add new patch number below this line */
|
|
81
|
+
+ /**/
|
|
82
|
+
+ 445,
|
|
83
|
+
/**/
|
|
84
|
+
|
|
85
|
+
--
|
|
86
|
+
hundred-and-one symptoms of being an internet addict:
|
|
87
|
+
159. You get excited whenever discussing your hard drive.
|
|
88
|
+
|
|
89
|
+
/// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\
|
|
90
|
+
/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
|
|
91
|
+
\\\ an exciting new programming language -- http://www.Zimbu.org ///
|
|
92
|
+
\\\ help me help AIDS victims -- http://ICCF-Holland.org ///
|