|
 |
22c937 |
To: vim_dev@googlegroups.com
|
|
|
22c937 |
Subject: Patch 7.4.445
|
|
|
22c937 |
Fcc: outbox
|
|
|
22c937 |
From: Bram Moolenaar <Bram@moolenaar.net>
|
|
|
22c937 |
Mime-Version: 1.0
|
|
|
22c937 |
Content-Type: text/plain; charset=UTF-8
|
|
|
22c937 |
Content-Transfer-Encoding: 8bit
|
|
|
22c937 |
------------
|
|
|
22c937 |
|
|
|
22c937 |
Patch 7.4.445
|
|
|
22c937 |
Problem: Clipboard may be cleared on startup.
|
|
|
22c937 |
Solution: Set clip_did_set_selection to -1 during startup. (Christian
|
|
|
22c937 |
Brabandt)
|
|
|
22c937 |
Files: src/main.c, src/ui.c
|
|
|
22c937 |
|
|
|
22c937 |
|
|
|
22c937 |
*** ../vim-7.4.444/src/main.c 2014-09-09 17:47:34.584544079 +0200
|
|
|
22c937 |
--- src/main.c 2014-09-19 13:38:29.802398710 +0200
|
|
|
22c937 |
***************
|
|
|
22c937 |
*** 958,965 ****
|
|
|
22c937 |
--- 958,974 ----
|
|
|
22c937 |
if (p_im)
|
|
|
22c937 |
need_start_insertmode = TRUE;
|
|
|
22c937 |
|
|
|
22c937 |
+ #ifdef FEAT_CLIPBOARD
|
|
|
22c937 |
+ if (clip_unnamed)
|
|
|
22c937 |
+ /* do not overwrite system clipboard while starting up */
|
|
|
22c937 |
+ clip_did_set_selection = -1;
|
|
|
22c937 |
+ #endif
|
|
|
22c937 |
#ifdef FEAT_AUTOCMD
|
|
|
22c937 |
apply_autocmds(EVENT_VIMENTER, NULL, NULL, FALSE, curbuf);
|
|
|
22c937 |
+ # ifdef FEAT_CLIPBOARD
|
|
|
22c937 |
+ if (clip_did_set_selection < 0)
|
|
|
22c937 |
+ clip_did_set_selection = TRUE;
|
|
|
22c937 |
+ # endif
|
|
|
22c937 |
TIME_MSG("VimEnter autocommands");
|
|
|
22c937 |
#endif
|
|
|
22c937 |
|
|
|
22c937 |
*** ../vim-7.4.444/src/ui.c 2014-08-06 18:17:03.475147780 +0200
|
|
|
22c937 |
--- src/ui.c 2014-09-19 13:39:48.442398882 +0200
|
|
|
22c937 |
***************
|
|
|
22c937 |
*** 571,577 ****
|
|
|
22c937 |
{
|
|
|
22c937 |
clip_unnamed_saved = clip_unnamed;
|
|
|
22c937 |
|
|
|
22c937 |
! if (clip_did_set_selection)
|
|
|
22c937 |
{
|
|
|
22c937 |
clip_unnamed = FALSE;
|
|
|
22c937 |
clip_did_set_selection = FALSE;
|
|
|
22c937 |
--- 571,577 ----
|
|
|
22c937 |
{
|
|
|
22c937 |
clip_unnamed_saved = clip_unnamed;
|
|
|
22c937 |
|
|
|
22c937 |
! if (clip_did_set_selection > 0)
|
|
|
22c937 |
{
|
|
|
22c937 |
clip_unnamed = FALSE;
|
|
|
22c937 |
clip_did_set_selection = FALSE;
|
|
|
22c937 |
***************
|
|
|
22c937 |
*** 584,590 ****
|
|
|
22c937 |
void
|
|
|
22c937 |
end_global_changes()
|
|
|
22c937 |
{
|
|
|
22c937 |
! if (!clip_did_set_selection)
|
|
|
22c937 |
{
|
|
|
22c937 |
clip_did_set_selection = TRUE;
|
|
|
22c937 |
clip_unnamed = clip_unnamed_saved;
|
|
|
22c937 |
--- 584,590 ----
|
|
|
22c937 |
void
|
|
|
22c937 |
end_global_changes()
|
|
|
22c937 |
{
|
|
|
22c937 |
! if (clip_did_set_selection == FALSE) /* not when -1 */
|
|
|
22c937 |
{
|
|
|
22c937 |
clip_did_set_selection = TRUE;
|
|
|
22c937 |
clip_unnamed = clip_unnamed_saved;
|
|
|
22c937 |
*** ../vim-7.4.444/src/version.c 2014-09-15 14:25:51.309650006 +0200
|
|
|
22c937 |
--- src/version.c 2014-09-19 13:35:30.618398318 +0200
|
|
|
22c937 |
***************
|
|
|
22c937 |
*** 743,744 ****
|
|
|
22c937 |
--- 743,746 ----
|
|
|
22c937 |
{ /* Add new patch number below this line */
|
|
|
22c937 |
+ /**/
|
|
|
22c937 |
+ 445,
|
|
|
22c937 |
/**/
|
|
|
22c937 |
|
|
|
22c937 |
--
|
|
|
22c937 |
hundred-and-one symptoms of being an internet addict:
|
|
|
22c937 |
159. You get excited whenever discussing your hard drive.
|
|
|
22c937 |
|
|
|
22c937 |
/// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\
|
|
|
22c937 |
/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
|
|
|
22c937 |
\\\ an exciting new programming language -- http://www.Zimbu.org ///
|
|
|
22c937 |
\\\ help me help AIDS victims -- http://ICCF-Holland.org ///
|