From 30ff30e766a226d3eaec647525a46906f3e1aa9f Mon Sep 17 00:00:00 2001 From: Jim Porter Date: Sat, 4 Dec 2021 13:16:56 -0800 Subject: [PATCH] Rename context menu separators to 'FOO-separator' for consistency * lisp/mouse.el (context-menu-toolbar, context-menu-global) (context-menu-local, context-menu-minor, context-menu-buffers) (context-menu-vc, context-menu-undo, context-menu-region): Rename separators to 'FOO-separator'. --- lisp/mouse.el | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/lisp/mouse.el b/lisp/mouse.el index b5ca80a446..ca58dff47f 100644 --- a/lisp/mouse.el +++ b/lisp/mouse.el @@ -357,7 +357,7 @@ context-menu-middle-separator (defun context-menu-toolbar (menu _click) "Populate MENU with submenus from the tool bar." (run-hooks 'activate-menubar-hook 'menu-bar-update-hook) - (define-key-after menu [separator-toolbar] menu-bar-separator) + (define-key-after menu [toolbar-separator] menu-bar-separator) (map-keymap (lambda (key binding) (when (consp binding) (define-key-after menu (vector key) @@ -368,7 +368,7 @@ context-menu-toolbar (defun context-menu-global (menu _click) "Populate MENU with submenus from the global menu." (run-hooks 'activate-menubar-hook 'menu-bar-update-hook) - (define-key-after menu [separator-global] menu-bar-separator) + (define-key-after menu [global-separator] menu-bar-separator) (map-keymap (lambda (key binding) (when (consp binding) (define-key-after menu (vector key) @@ -379,7 +379,7 @@ context-menu-global (defun context-menu-local (menu _click) "Populate MENU with submenus provided by major mode." (run-hooks 'activate-menubar-hook 'menu-bar-update-hook) - (define-key-after menu [separator-local] menu-bar-separator) + (define-key-after menu [local-separator] menu-bar-separator) (let ((keymap (local-key-binding [menu-bar]))) (when keymap (map-keymap (lambda (key binding) @@ -392,7 +392,7 @@ context-menu-local (defun context-menu-minor (menu _click) "Populate MENU with submenus provided by minor modes." (run-hooks 'activate-menubar-hook 'menu-bar-update-hook) - (define-key-after menu [separator-minor] menu-bar-separator) + (define-key-after menu [minor-separator] menu-bar-separator) (dolist (mode (reverse (minor-mode-key-binding [menu-bar]))) (when (and (consp mode) (symbol-value (car mode))) (map-keymap (lambda (key binding) @@ -405,7 +405,7 @@ context-menu-minor (defun context-menu-buffers (menu _click) "Populate MENU with the buffer submenus to buffer switching." (run-hooks 'activate-menubar-hook 'menu-bar-update-hook) - (define-key-after menu [separator-buffers] menu-bar-separator) + (define-key-after menu [buffers-separator] menu-bar-separator) (map-keymap (lambda (key binding) (when (consp binding) (define-key-after menu (vector key) @@ -415,13 +415,13 @@ context-menu-buffers (defun context-menu-vc (menu _click) "Populate MENU with Version Control commands." - (define-key-after menu [separator-vc] menu-bar-separator) + (define-key-after menu [vc-separator] menu-bar-separator) (define-key-after menu [vc-menu] vc-menu-entry) menu) (defun context-menu-undo (menu _click) "Populate MENU with undo commands." - (define-key-after menu [separator-undo] menu-bar-separator) + (define-key-after menu [undo-separator] menu-bar-separator) (when (and (not buffer-read-only) (not (eq t buffer-undo-list)) (if (eq last-command 'undo) @@ -439,7 +439,7 @@ context-menu-undo (defun context-menu-region (menu click) "Populate MENU with region commands." - (define-key-after menu [separator-region] menu-bar-separator) + (define-key-after menu [region-separator] menu-bar-separator) (when (and mark-active (not buffer-read-only)) (define-key-after menu [cut] '(menu-item "Cut" kill-region -- 2.25.1