[elpa] externals/ergoemacs-mode 6f340f9 199/325: Change help of a prefix key to 'Prefix Key'

[Stefan Monnier]

branch: externals/ergoemacs-mode
commit 6f340f9e11f1a05c0fd7117c45b5e23e06b00af3
Author: Walter Landry <wlandry@caltech.edu>
Commit: Walter Landry <wlandry@caltech.edu>

    Change help of a prefix key to 'Prefix Key'
---
 ergoemacs-theme-engine.el | 46 ++++++++++++++++++++++++++--------------------
 kbd-ergo.svg              | 13 -------------
 2 files changed, 26 insertions(+), 33 deletions(-)

diff --git a/ergoemacs-theme-engine.el b/ergoemacs-theme-engine.el
index b88134f..9feb811 100644
--- a/ergoemacs-theme-engine.el
+++ b/ergoemacs-theme-engine.el
@@ -663,27 +663,33 @@ See also `find-function-recenter-line' and 
`find-function-after-hook'."
                )
          (when (integerp binding)
            (setq binding nil))
-         (or (and binding
-                  (ergoemacs-keymapp binding)
-                  (or (and (not no-push-p) (push key 
ergoemacs-theme--svg-prefixes))
-                      no-push-p)
-                  "⌨")
-             ;; Handle the M-O binding specially.
-             (and (eq binding 'ergoemacs-handle-M-O)
-                  (or
-                   (progn
-                     (setq key (assoc ergoemacs-M-O-binding 
ergoemacs-function-short-names))
-                     (nth 1 key)
-                     )
-                   ""
-                   )
+         (or ;; Prefix keys (e.g. C-x, C-h)
+          (and binding
+               (ergoemacs-keymapp binding)
+               (or (and (not no-push-p) (push key 
ergoemacs-theme--svg-prefixes))
+                   no-push-p)
+               "Prefix Key")
+          ;; Handle the M-O binding specially.
+          (and (eq binding 'ergoemacs-handle-M-O)
+               (or
+                (progn
+                  (setq key (assoc ergoemacs-M-O-binding 
ergoemacs-function-short-names))
+                  (nth 1 key)
                   )
-             (and binding
-                  (setq key (assoc binding ergoemacs-function-short-names))
-                  (nth 1 key))
-             (and binding
-                  (ergoemacs-theme--svg-elt-nonabbrev binding))
-             "")))
+                ""
+                )
+               )
+          ;; Regular bindings
+          (and binding
+               (setq key (assoc binding ergoemacs-function-short-names))
+               (nth 1 key))
+          ;; Unknown binding
+          (and binding
+               (ergoemacs-theme--svg-elt-nonabbrev binding))
+          ""
+          )
+         )
+       )
       ((memq elt '(meta control))
        (concat (ergoemacs-key-description--modifier elt) (format " - Emacs %s" 
elt))
        )
diff --git a/kbd-ergo.svg b/kbd-ergo.svg
index 8f0ab67..c0347a1 100644
--- a/kbd-ergo.svg
+++ b/kbd-ergo.svg
@@ -6989,19 +6989,6 @@
        y="573.65869">AA</tspan></text>
   <text
      xml:space="preserve"
-     
style="font-size:11.85218239px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans;-inkscape-font-specification:Helvetica"
-     x="56.430885"
-     y="528.07928"
-     id="text3505-9-9-7-6-0-4-5"
-     sodipodi:linespacing="125%"
-     transform="scale(0.98217521,1.0181483)"><tspan
-       sodipodi:role="line"
-       id="tspan3507-09-3-5-3-5-6-82"
-       x="56.430885"
-       y="528.07928"
-       
style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;fill:#000000;font-family:Sans;-inkscape-font-specification:Helvetica
 Bold">⌨ = Emacs Command Sequence </tspan></text>
-  <text
-     xml:space="preserve"
      
style="font-size:11.85218239px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000080;fill-opacity:1;stroke:none;font-family:Sans;-inkscape-font-specification:Helvetica"
      x="21.28425"
      y="171.75562"