Skip to content

Commit

Permalink
Merge branch 'pr/565' into 3.0
Browse files Browse the repository at this point in the history
Fixes #564, #565
  • Loading branch information
johntyree committed Feb 20, 2014
2 parents 65d344d + 5f6b198 commit 8ba227e
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion .vimrc
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@
scriptencoding utf-8

if has('clipboard')
if LINUX() " On Linux use + register for copy-paste
if has('unnamedplus') " When possible use + register for copy-paste
set clipboard=unnamedplus
else " On mac and Windows, use * register for copy-paste
set clipboard=unnamed
Expand Down

0 comments on commit 8ba227e

Please sign in to comment.