(python-base-mode-map): Use it!

Rather than use `copy-keymap` between `python-mode-map` and
`python-ts-mode-map`, move the shared bindings to `python-base-mode-map`.

* lisp/progmodes/python.el (python-base-mode-map): Define it explicitly.
Move all the bindings of `python-mode-map` to it.
(python-mode-map, python-ts-mode-map): Inherit from it.

(cherry picked from commit 2dea3a0d34859852d3577f6054acb49f6e515eb2)

diff --git a/lisp/progmodes/python.el b/lisp/progmodes/python.el
index da0754f41b33acb89a1f5cb920085589d254f22a..a0a84fac0c3e236fcc51f5a25ee09cd3437fb937 100644 (file)
--- a/lisp/progmodes/python.el
+++ b/lisp/progmodes/python.el
@@ -325,8 +325,8 @@ effect."
 \f
 ;;; Bindings
 
-(defvar-keymap python-mode-map
-  :doc "Keymap for `python-mode'."
+(defvar-keymap python-base-mode-map
+  :doc "Keymap for `python-base-mode'."
   ;; Movement
   "<remap> <backward-sentence>" #'python-nav-backward-block
   "<remap> <forward-sentence>"  #'python-nav-forward-block
@@ -369,7 +369,7 @@ effect."
   ;; Utilities
   "<remap> <complete-symbol>" #'completion-at-point)
 
-(easy-menu-define python-menu python-mode-map
+(easy-menu-define python-menu python-base-mode-map
   "Menu used for ´python-mode'."
   '("Python"
     :help "Python-specific Features"
@@ -430,7 +430,10 @@ effect."
       :style toggle :selected subword-mode
       :help "Toggle subword movement and editing mode"])))
 
-(defvar python-ts-mode-map (copy-keymap python-mode-map)
+(defvar python-mode-map (make-composed-keymap nil python-base-mode-map)
+ "Keymap for `python-mode'.")
+
+(defvar python-ts-mode-map (make-composed-keymap nil python-base-mode-map)
   "Keymap for `python-ts-mode'.")
 
 \f