From 760efe9b58b4dadebde11d12d9bfd31541e973cb Mon Sep 17 00:00:00 2001
From: Junji Hashimoto <junji.hashimoto@gmail.com>
Date: Sun, 10 Jun 2018 01:24:48 +0900
Subject: [PATCH] Fix killWord for emacs-keymap

---
 yi-keymap-emacs/src/Yi/Keymap/Emacs.hs          | 2 +-
 yi-keymap-emacs/src/Yi/Keymap/Emacs/KillRing.hs | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/yi-keymap-emacs/src/Yi/Keymap/Emacs.hs b/yi-keymap-emacs/src/Yi/Keymap/Emacs.hs
index 7ec34fc8e..c33e97571 100644
--- a/yi-keymap-emacs/src/Yi/Keymap/Emacs.hs
+++ b/yi-keymap-emacs/src/Yi/Keymap/Emacs.hs
@@ -193,7 +193,7 @@ emacsKeys univArg =
          , metaCh 'a'           ?>>! repeatingArg (moveE unitSentence Backward)
          , metaCh 'b'           ?>>! repeatingArg prevWordB
          , metaCh 'c'           ?>>! repeatingArg capitaliseWordB
-         , metaCh 'd'           ?>>! repeatingArg killWordB
+         , metaCh 'd'           ?>>! killWord
          , metaCh 'e'           ?>>! repeatingArg (moveE unitSentence Forward)
          , metaCh 'f'           ?>>! repeatingArg nextWordB
          , metaCh 'h'           ?>>! repeatingArg (selectNParagraphs 1)
diff --git a/yi-keymap-emacs/src/Yi/Keymap/Emacs/KillRing.hs b/yi-keymap-emacs/src/Yi/Keymap/Emacs/KillRing.hs
index deffc64d9..b24ca44fa 100644
--- a/yi-keymap-emacs/src/Yi/Keymap/Emacs/KillRing.hs
+++ b/yi-keymap-emacs/src/Yi/Keymap/Emacs/KillRing.hs
@@ -65,6 +65,11 @@ killLineB mbr = replicateM_ (fromMaybe 1 mbr) $ do
 killLine :: Maybe Int -> YiM ()
 killLine mbr = withCurrentBuffer (killLineB mbr) >> killringToClipboard
 
+-- | M-d
+-- | Like `killWordB`, but with system clipboard synchronization
+killWord :: YiM ()
+killWord = withCurrentBuffer (killWordB) >> killringToClipboard
+
 killringGet :: EditorM R.YiString
 killringGet = do
   text :| _ <- uses killringA _krContents