From 1c3b3206144c074ab490a5ee0ccd265d12647ad7 Mon Sep 17 00:00:00 2001
From: Lars Ingebrigtsen <larsi@gnus.org>
Date: Thu, 11 Jul 2019 16:53:43 +0200
Subject: [PATCH] Tweak the order keystrokes are sorted in keymap listings

* src/keymap.c (describe_map_compare): Change the sorting order of
keystrokes, so that we get the order <f1> <f2> <f11> instead of
<f1> <f11> <f2> (bug#33237).
---
 src/keymap.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/keymap.c b/src/keymap.c
index 2ac3d33460c..fc04c565a1e 100644
--- a/src/keymap.c
+++ b/src/keymap.c
@@ -3098,8 +3098,10 @@ describe_map_compare (const void *aa, const void *bb)
   if (FIXNUMP (a->event) && !FIXNUMP (b->event))
     return -1;
   if (SYMBOLP (a->event) && SYMBOLP (b->event))
-    return (!NILP (Fstring_lessp (a->event, b->event)) ? -1
-	    : !NILP (Fstring_lessp (b->event, a->event)) ? 1
+    /* Sort the keystroke names in the "natural" way, with (for
+       instance) "<f2>" coming between "<f1>" and "<f11>".  */
+    return (!NILP (Fstring_version_lessp (a->event, b->event)) ? -1
+	    : !NILP (Fstring_version_lessp (b->event, a->event)) ? 1
 	    : 0);
   return 0;
 }
-- 
2.39.5