(Fset_keymap_parent): Return early if KEYMAP already has the proper parent.

1 files changed, 5 insertions, 0 deletions

diff --git a/src/keymap.c b/src/keymap.c
index a0c28bb0782..88f89cdf72b 100644
--- a/src/keymap.c
+++ b/src/keymap.c
@@ -307,6 +307,11 @@ PARENT should be nil or another keymap.")
          If we came to the end, add the parent in PREV.  */
       if (! CONSP (list) || EQ (Qkeymap, XCONS (list)->car))
         {
+          /* If we already have the right parent, return now
+             so that we avoid the loops below.  */
+          if (EQ (XCONS (prev)->cdr, parent))
+            return parent;
+
           XCONS (prev)->cdr = parent;
           break;
         }