* lisp/mouse.el (context-menu-toolbar): New function.

(context-menu-functions): Add context-menu-toolbar to choice.
(context-menu-region): Bind "Paste" to mouse-yank-at-click
instead of mouse-yank-primary.
https://lists.gnu.org/archive/html/emacs-devel/2021-08/msg00735.html

diff --git a/lisp/mouse.el b/lisp/mouse.el
index 6332d9fcec3716b080a88353e882a72e4905a2b0..28996e373d9d76a1744be7fdcb782094891fd88a 100644 (file)
--- a/lisp/mouse.el
+++ b/lisp/mouse.el
@@ -289,6 +289,7 @@ the same menu with changes such as added new menu items."
   :type '(repeat
           (choice (function-item context-menu-undo)
                   (function-item context-menu-region)
+                  (function-item context-menu-toolbar)
                   (function-item context-menu-global)
                   (function-item context-menu-local)
                   (function-item context-menu-minor)
@@ -313,6 +314,17 @@ the same menu with changes such as added new menu items."
       (setq menu (funcall context-menu-filter-function menu)))
     menu))
 
+(defun context-menu-toolbar (menu)
+  "Tool bar menu items."
+  (run-hooks 'activate-menubar-hook 'menu-bar-update-hook)
+  (define-key-after menu [separator-toolbar] menu-bar-separator)
+  (map-keymap (lambda (key binding)
+                (when (consp binding)
+                  (define-key-after menu (vector key)
+                    (copy-sequence binding))))
+              (lookup-key global-map [tool-bar]))
+  menu)
+
 (defun context-menu-global (menu)
   "Global submenus."
   (run-hooks 'activate-menubar-hook 'menu-bar-update-hook)
@@ -396,7 +408,7 @@ the same menu with changes such as added new menu items."
                            "\\[ns-copy-including-secondary]"
                          "\\[kill-ring-save]")))
   (define-key-after menu [paste]
-    `(menu-item "Paste" mouse-yank-primary
+    `(menu-item "Paste" mouse-yank-at-click
                 :visible (funcall
                           ',(lambda ()
                               (and (or