[nongnu] elpa/xah-fly-keys 845dd0636e 2/2: fix and new keymaps for the Colemak DH layout variations. Now with more accurate name for the Colemak DH variations: dhm, dhk, and dhk with angle-mode. For users, change your layout to one of (string): colemak-dhm colemak-dhm-angle colemak-dhk the following layout names are removed: colemak-mod-dh (use colemak-dhk instead) colemak-mod-dh-new (use colemak-dhm-angle instead) internal: * new: xah--dvorak-to-colemak-dhm-kmap is the offical Colemak DH (aka DHm) layout. * new: xah--dvorak-to-colemak-dhm-angle-kmap is the Colemak DHm layout with angle-mode. * new: xah--dvorak-to-colemak-dhk-kmap is the Colemak DHk layout. * old: xah--dvorak-to-colemak-mod-dh-kmap is now removed. (it was for Colemak DHk) * old: xah--dvorak-to-colemak-mod-dh-new-kmap is now removed. (it was for Colemak DHm angle mode)

[ELPA Syncer]

branch: elpa/xah-fly-keys
commit 845dd0636ef52bc76cf5fe2b7a238558d45f2849
Author: Xah Lee <xah@xahlee.org>
Commit: Xah Lee <xah@xahlee.org>

    fix and new keymaps for the Colemak DH layout variations. Now with more 
accurate name for the Colemak DH variations: dhm, dhk, and dhk with angle-mode. 
For users, change your layout to one of (string): colemak-dhm colemak-dhm-angle 
colemak-dhk the following layout names are removed: colemak-mod-dh (use 
colemak-dhk instead) colemak-mod-dh-new (use colemak-dhm-angle instead) 
internal: * new: xah--dvorak-to-colemak-dhm-kmap is the offical Colemak DH (aka 
DHm) layout. * new: xah--dvorak-t [...]
---
 xah-fly-keys.el | 120 ++++++++++++++++++++++++++++++++++++--------------------
 1 file changed, 77 insertions(+), 43 deletions(-)

diff --git a/xah-fly-keys.el b/xah-fly-keys.el
index a6b09bfde0..28fe534161 100644
--- a/xah-fly-keys.el
+++ b/xah-fly-keys.el
@@ -4,7 +4,7 @@
 
 ;; Author: Xah Lee ( http://xahlee.info/ )
 ;; Maintainer: Xah Lee <xah@xahlee.org>
-;; Version: 17.23.20220911113118
+;; Version: 18.0.20220911124616
 ;; Created: 10 Sep 2013
 ;; Package-Requires: ((emacs "24.1"))
 ;; Keywords: convenience, emulations, vim, ergoemacs
@@ -125,8 +125,9 @@
 ;; carpalx-qgmlwb
 ;; carpalx-qgmlwy
 ;; colemak
-;; colemak-mod-dh
-;; colemak-mod-dh-new
+;; colemak-dhm
+;; colemak-dhm-angle
+;; colemak-dhk
 ;; dvorak
 ;; koy
 ;; neo2
@@ -2963,65 +2964,96 @@ Version: 2017-01-29"
     ("z" . "/"))
   "A alist, similar to `xah--dvorak-to-qwerty-kmap'")
 
-(defvar xah--dvorak-to-colemak-mod-dh-kmap
+(defvar xah--dvorak-to-colemak-dhm-kmap
   '(("'" . "q")
     ("," . "w")
     ("." . "f")
-    ("y" . "b")
-    ("f" . "j")
-    ("g" . "l")
+    (";" . "z")
+    ("b" . "k")
     ("c" . "u")
-    ("r" . "y")
-    ("l" . ";")
-    ("o" . "r")
+    ("d" . "m")
     ("e" . "s")
-    ("u" . "t")
-    ("i" . "g")
-    ("d" . "k")
+    ("f" . "j")
+    ("g" . "l")
     ("h" . "n")
-    ("t" . "e")
-    ("n" . "i")
-    ("s" . "o")
-    (";" . "z")
-    ("q" . "x")
+    ("i" . "g")
     ("j" . "c")
     ("k" . "d")
-    ("x" . "v")
-    ("b" . "m")
+    ("l" . ";")
     ("m" . "h")
-    ("w" . ",")
+    ("n" . "i")
+    ("o" . "r")
+    ("q" . "x")
+    ("r" . "y")
+    ("s" . "o")
+    ("t" . "e")
+    ("u" . "t")
     ("v" . ".")
+    ("w" . ",")
+    ("x" . "v")
+    ("y" . "b")
     ("z" . "/"))
-  "A alist, similar to `xah--dvorak-to-qwerty-kmap'")
+  "A alist, similar to `xah--dvorak-to-qwerty-kmap'.")
 
-(defvar xah--dvorak-to-colemak-mod-dh-new-kmap
+(defvar xah--dvorak-to-colemak-dhm-angle-kmap
   '(("'" . "q")
     ("," . "w")
     ("." . "f")
-    ("y" . "b")
+    (";" . "x")
+    ("b" . "k")
+    ("c" . "u")
+    ("d" . "m")
+    ("e" . "s")
     ("f" . "j")
     ("g" . "l")
-    ("c" . "u")
-    ("r" . "y")
+    ("h" . "n")
+    ("i" . "g")
+    ("j" . "d")
+    ("k" . "v")
     ("l" . ";")
+    ("m" . "h")
+    ("n" . "i")
     ("o" . "r")
-    ("e" . "s")
+    ("q" . "c")
+    ("r" . "y")
+    ("s" . "o")
+    ("t" . "e")
     ("u" . "t")
-    ("i" . "g")
-    ("d" . "m")
+    ("v" . ".")
+    ("w" . ",")
+    ("x" . "\\")
+    ("y" . "b")
+    ("z" . "/"))
+  "A alist, similar to `xah--dvorak-to-qwerty-kmap'. This is Colemak DHk 
layout with Angle mode.")
+
+(defvar xah--dvorak-to-colemak-dhk-kmap
+  '(("'" . "q")
+    ("," . "w")
+    ("." . "f")
+    (";" . "z")
+    ("b" . "m")
+    ("c" . "u")
+    ("d" . "k")
+    ("e" . "s")
+    ("f" . "j")
+    ("g" . "l")
     ("h" . "n")
-    ("t" . "e")
+    ("i" . "g")
+    ("j" . "c")
+    ("k" . "d")
+    ("l" . ";")
+    ("m" . "h")
     ("n" . "i")
+    ("o" . "r")
+    ("q" . "x")
+    ("r" . "y")
     ("s" . "o")
-    (";" . "x")
-    ("q" . "c")
-    ("j" . "d")
-    ("k" . "v")
-    ("x" . "\\")
-    ("b" . "k")
-    ("m" . "h")
-    ("w" . ",")
+    ("t" . "e")
+    ("u" . "t")
     ("v" . ".")
+    ("w" . ",")
+    ("x" . "v")
+    ("y" . "b")
     ("z" . "/"))
   "A alist, similar to `xah--dvorak-to-qwerty-kmap'")
 
@@ -3590,12 +3622,13 @@ If the value is nil, it is automatically set to 
\"qwerty\"."
           (const :tag "Carpalx QFMLWY" carpalx-qfmlwy)
           (const :tag "Carpalx QGMLWB" carpalx-qgmlwb)
           (const :tag "Carpalx QGMLWY" carpalx-qgmlwy)
-          (const :tag "Colemak Mod-DH" colemak-mod-dh)
           (const :tag "Colemak" colemak)
+          (const :tag "Colemak DH" colemak-dhm)
+          (const :tag "Colemak DHm angle-mode" colemak-dhm-angle)
+          (const :tag "Colemak DHk" colemak-dhk)
           (const :tag "Dvorak" dvorak)
           (const :tag "Koy" koy)
           (const :tag "Neo2" neo2)
-          (const :tag "New Colemak Mod-DH with M on the home row" 
colemak-mod-dh-new)
           (const :tag "Norman" norman)
           (const :tag "PT-nativo" pt-nativo)
           (const :tag "Portuguese QWERTY (ABNT)" qwerty-abnt)
@@ -4553,8 +4586,9 @@ Argument must be one of:
  carpalx-qgmlwb
  carpalx-qgmlwy
  colemak
- colemak-mod-dh
- colemak-mod-dh-new
+ colemak-dhm
+ colemak-dhm-angle
+ colemak-dhk
  dvorak
  koy
  neo2
@@ -4569,7 +4603,7 @@ Argument must be one of:
 
 In elisp, those should be strings.
 
-Version: 2021-05-19 2021-09-17"
+Version: 2021-05-19 2021-09-17 2022-09-11 2022-09-11"
   (interactive
    (list
     (widget-prompt-value