From dd756c27fc51fd2be1af893b41b10b618ffa83ce Mon Sep 17 00:00:00 2001 From: Christian Duerr Date: Sun, 21 Apr 2019 00:52:06 +0000 Subject: Fix selection copying on Windows The `copypasta` crate incorrectly mapped the secondary clipboard on Windows to the primary clipboard, leading to the primary clipboard getting overwritten whenever the selection clipboard was updated. The new Windows clipboard mimics the macOS clipboard, which also does not have a selection clipboard. This fixes #2050. --- copypasta/src/windows.rs | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) (limited to 'copypasta') diff --git a/copypasta/src/windows.rs b/copypasta/src/windows.rs index 48b033cc..3bff6e59 100644 --- a/copypasta/src/windows.rs +++ b/copypasta/src/windows.rs @@ -40,11 +40,6 @@ impl Load for Clipboard { let mut ctx: ClipboardContext = ClipboardProvider::new().unwrap(); ctx.get_contents().map_err(Error::Clipboard) } - - fn load_selection(&self) -> Result { - let mut ctx: ClipboardContext = ClipboardProvider::new().unwrap(); - ctx.get_contents().map_err(Error::Clipboard) - } } impl Store for Clipboard { @@ -63,6 +58,7 @@ impl Store for Clipboard { where S: Into, { - self.0.set_contents(contents.into()).map_err(Error::Clipboard) + // No such thing on Windows + Ok(()) } } -- cgit v1.2.3-54-g00ecf