master 405660e: Fix up gnus-summary-mode-map after previous change

[Lars Ingebrigtsen]

branch: master
commit 405660e785228bbfe375f8997174f0a33fd5838b
Author: Lars Ingebrigtsen <larsi@gnus.org>
Commit: Lars Ingebrigtsen <larsi@gnus.org>

    Fix up gnus-summary-mode-map after previous change
    
    * lisp/gnus/gnus-sum.el (:keymap): Fix two sub-maps that were
    moved to the wrong place.
---
 lisp/gnus/gnus-sum.el | 53 ++++++++++++++++++++++++---------------------------
 1 file changed, 25 insertions(+), 28 deletions(-)

diff --git a/lisp/gnus/gnus-sum.el b/lisp/gnus/gnus-sum.el
index 6d09576..ab8c578 100644
--- a/lisp/gnus/gnus-sum.el
+++ b/lisp/gnus/gnus-sum.el
@@ -2032,8 +2032,6 @@ increase the score of each group you read."
   "b" #'gnus-article-view-part
   "\M-t" #'gnus-summary-toggle-display-buttonized
 
-  "V" #'gnus-summary-score-map
-  "X" #'gnus-uu-extract-map
   "S" #'gnus-summary-send-map
 
   ;; Sort of orthogonal keymaps.
@@ -2058,13 +2056,32 @@ increase the score of each group you read."
         "\C-c" #'gnus-summary-catchup-all
         "k" #'gnus-summary-kill-same-subject-and-select
         "K" #'gnus-summary-kill-same-subject
-        "P" #'gnus-uu-mark-map)
 
-  "V" (define-keymap :prefix 'gnus-summary-mscore-map
-        "c" #'gnus-summary-clear-above
-        "u" #'gnus-summary-tick-above
-        "m" #'gnus-summary-mark-above
-        "k" #'gnus-summary-kill-below)
+        "P" (define-keymap :prefix 'gnus-uu-mark-map
+              "p" #'gnus-summary-mark-as-processable
+              "u" #'gnus-summary-unmark-as-processable
+              "U" #'gnus-summary-unmark-all-processable
+              "v" #'gnus-uu-mark-over
+              "s" #'gnus-uu-mark-series
+              "r" #'gnus-uu-mark-region
+              "g" #'gnus-uu-unmark-region
+              "R" #'gnus-uu-mark-by-regexp
+              "G" #'gnus-uu-unmark-by-regexp
+              "t" #'gnus-uu-mark-thread
+              "T" #'gnus-uu-unmark-thread
+              "a" #'gnus-uu-mark-all
+              "b" #'gnus-uu-mark-buffer
+              "S" #'gnus-uu-mark-sparse
+              "k" #'gnus-summary-kill-process-mark
+              "y" #'gnus-summary-yank-process-mark
+              "w" #'gnus-summary-save-process-mark
+              "i" #'gnus-uu-invert-processable)
+
+        "V" (define-keymap :prefix 'gnus-summary-mscore-map
+              "c" #'gnus-summary-clear-above
+              "u" #'gnus-summary-tick-above
+              "m" #'gnus-summary-mark-above
+              "k" #'gnus-summary-kill-below))
 
   "/" (define-keymap :prefix 'gnus-summary-limit-map
         "/" #'gnus-summary-limit-to-subject
@@ -2340,26 +2357,6 @@ increase the score of each group you read."
         "i" #'gnus-article-inline-part
         "|" #'gnus-article-pipe-part)
 
-  "P" (define-keymap :prefix 'gnus-uu-mark-map
-        "p" #'gnus-summary-mark-as-processable
-        "u" #'gnus-summary-unmark-as-processable
-        "U" #'gnus-summary-unmark-all-processable
-        "v" #'gnus-uu-mark-over
-        "s" #'gnus-uu-mark-series
-        "r" #'gnus-uu-mark-region
-        "g" #'gnus-uu-unmark-region
-        "R" #'gnus-uu-mark-by-regexp
-        "G" #'gnus-uu-unmark-by-regexp
-        "t" #'gnus-uu-mark-thread
-        "T" #'gnus-uu-unmark-thread
-        "a" #'gnus-uu-mark-all
-        "b" #'gnus-uu-mark-buffer
-        "S" #'gnus-uu-mark-sparse
-        "k" #'gnus-summary-kill-process-mark
-        "y" #'gnus-summary-yank-process-mark
-        "w" #'gnus-summary-save-process-mark
-        "i" #'gnus-uu-invert-processable)
-
   "X" (define-keymap :prefix 'gnus-uu-extract-map
         ;;"x" gnus-uu-extract-any
         "m" #'gnus-summary-save-parts