lib/textbringer/commands/clipboard.rb in textbringer-0.1.6 vs lib/textbringer/commands/clipboard.rb in textbringer-0.1.7

@@ -3,19 +3,20 @@
 require "clipboard"
 
 module Textbringer
   module Commands
     CLIPBOARD_AVAILABLE =
-      Clipboard.implementation.name != :Linux ||
+      Clipboard.implementation.name != "Clipboard::Linux" ||
       (ENV["DISPLAY"] && system("which xclip > /dev/null 2>&1"))
 
     if CLIPBOARD_AVAILABLE
       GLOBAL_MAP.define_key("\ew", :clipboard_copy_region)
       GLOBAL_MAP.define_key("\C-w", :clipboard_kill_region)
       GLOBAL_MAP.define_key(?\C-k, :clipboard_kill_line)
       GLOBAL_MAP.define_key("\ed", :clipboard_kill_word)
       GLOBAL_MAP.define_key("\C-y", :clipboard_yank)
+      GLOBAL_MAP.define_key("\ey", :clipboard_yank_pop)
     end
 
     define_command(:clipboard_copy_region) do
       copy_region
       Clipboard.copy(KILL_RING.current)
@@ -35,14 +36,19 @@
       kill_word
       Clipboard.copy(KILL_RING.current)
     end
 
     define_command(:clipboard_yank) do
-      s = Clipboard.paste.encode(Encoding::UTF_8)
+      s = Clipboard.paste.encode(Encoding::UTF_8).gsub(/\r\n/, "\n")
       if !s.empty? && (KILL_RING.empty? || KILL_RING.current != s)
         KILL_RING.push(s)
       end
       yank
       Controller.current.this_command = :yank
+    end
+
+    define_command(:clipboard_yank_pop) do
+      yank_pop
+      Clipboard.copy(KILL_RING.current)
     end
   end
 end