From 8d7627fd9c15fbd435c074978f2382d685a15a7d Mon Sep 17 00:00:00 2001
From: Kyle Meyer <kyle@kyleam.com>
Date: Sun, 1 Jul 2018 23:37:18 -0400
Subject: Update hyrdra-smerge for renamed commands

The previous names are obsolete as of Emacs 26.1.
---
 lisp/km-hydra.el | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

(limited to 'lisp')

diff --git a/lisp/km-hydra.el b/lisp/km-hydra.el
index d18c378..c5d87f2 100644
--- a/lisp/km-hydra.el
+++ b/lisp/km-hydra.el
@@ -35,13 +35,13 @@
 (defhydra hydra-smerge (:hint nil)
   "
 _b_ keep base    _d_ diff     _n_ next
-_m_ keep mine    _e_ ediff    _p_ previous
-_o_ keep other   _h_ refine
+_u_ keep upper   _e_ ediff    _p_ previous
+_l_ keep lower   _h_ refine
 _a_ keep all
 \n"
   ("b" smerge-keep-base)
-  ("m" smerge-keep-mine)
-  ("o" smerge-keep-other)
+  ("u" smerge-keep-upper)
+  ("l" smerge-keep-lower)
   ("a" smerge-keep-all)
   ("n" smerge-next)
   ("p" smerge-prev)
@@ -49,13 +49,13 @@ _a_ keep all
   ("e" smerge-ediff :color blue)
   ("d" (call-interactively
         (pcase (read-char-choice
-                "< base-mine, > base-other, = mine-other"
+                "< base-upper, > base-lower, = upper-lower"
                 (list ?< ?> ?=))
-          (?< #'smerge-diff-base-mine)
-          (?> #'smerge-diff-base-other)
-          (?= #'smerge-diff-mine-other))))
-  ("l" recenter-top-bottom "recenter")
-  ("u" undo "undo")
+          (?< #'smerge-diff-base-upper)
+          (?> #'smerge-diff-base-lower)
+          (?= #'smerge-diff-upper-lower))))
+  ("r" recenter-top-bottom "recenter")
+  ("U" undo "undo")
   ("q" nil "quit"))
 
 (defhydra hydra-file-search-map (:hint nil :color blue)
-- 
cgit v1.2.3