[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
master e5392d3: Make easymenu downcase the menu symbol for greater backw
From: |
Lars Ingebrigtsen |
Subject: |
master e5392d3: Make easymenu downcase the menu symbol for greater backwards compat |
Date: |
Mon, 1 Mar 2021 16:24:47 -0500 (EST) |
branch: master
commit e5392d38ac27c4cf1674997ab38a453877e65109
Author: Lars Ingebrigtsen <larsi@gnus.org>
Commit: Lars Ingebrigtsen <larsi@gnus.org>
Make easymenu downcase the menu symbol for greater backwards compat
* lisp/cmuscheme.el (map): Revert previous fix.
* lisp/woman.el (woman-dired-define-keys): Ditto.
* lisp/emacs-lisp/easymenu.el (easy-menu-do-define): Downcase the
menu name for greater backwards compatibility.
---
lisp/cmuscheme.el | 2 +-
lisp/emacs-lisp/easymenu.el | 6 +++++-
lisp/woman.el | 2 +-
3 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/lisp/cmuscheme.el b/lisp/cmuscheme.el
index f41f2bf..772891d 100644
--- a/lisp/cmuscheme.el
+++ b/lisp/cmuscheme.el
@@ -132,7 +132,7 @@
(define-key scheme-mode-map "\C-c\C-l" 'scheme-load-file)
(define-key scheme-mode-map "\C-c\C-k" 'scheme-compile-file) ;k for "kompile"
-(let ((map (lookup-key scheme-mode-map [menu-bar Scheme])))
+(let ((map (lookup-key scheme-mode-map [menu-bar scheme])))
(define-key map [separator-eval] '("--"))
(define-key map [compile-file]
'("Compile Scheme File" . scheme-compile-file))
diff --git a/lisp/emacs-lisp/easymenu.el b/lisp/emacs-lisp/easymenu.el
index faa6924..d3c3d5e 100644
--- a/lisp/emacs-lisp/easymenu.el
+++ b/lisp/emacs-lisp/easymenu.el
@@ -190,7 +190,11 @@ This is expected to be bound to a mouse event."
(function-put symbol 'completion-predicate #'ignore))
(dolist (map (if (keymapp maps) (list maps) maps))
(define-key map
- (vector 'menu-bar (easy-menu-intern (car menu)))
+ (vector 'menu-bar (if (symbolp (car menu))
+ (car menu)
+ ;; If a string, then use the downcased
+ ;; version for greater backwards compatibiltiy.
+ (intern (downcase (car menu)))))
(easy-menu-binding keymap (car menu))))))
(defun easy-menu-filter-return (menu &optional name)
diff --git a/lisp/woman.el b/lisp/woman.el
index 0a9f366..d4f7e8c 100644
--- a/lisp/woman.el
+++ b/lisp/woman.el
@@ -1523,7 +1523,7 @@ Also make each path-info component into a list.
(mapc 'woman-dired-define-key woman-dired-keys)
(woman-dired-define-key-maybe "w")
(woman-dired-define-key-maybe "W")))
- (define-key-after (lookup-key dired-mode-map [menu-bar Immediate])
+ (define-key-after (lookup-key dired-mode-map [menu-bar immediate])
[woman] '("Read Man Page (WoMan)" . woman-dired-find-file) 'view))
(if (featurep 'dired)
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- master e5392d3: Make easymenu downcase the menu symbol for greater backwards compat,
Lars Ingebrigtsen <=