aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLars Ingebrigtsen2019-10-20 17:07:01 +0200
committerLars Ingebrigtsen2019-10-20 17:07:01 +0200
commitcd4f707a987e954ef4ff1edb2639e4cb5c57bb59 (patch)
tree456f52f1185cf029c9bcc311393c87404a24daa9
parent270ca8c2735cfc7935b9e4d0b770a55138493ef3 (diff)
downloademacs-cd4f707a987e954ef4ff1edb2639e4cb5c57bb59.tar.gz
emacs-cd4f707a987e954ef4ff1edb2639e4cb5c57bb59.zip
Make edebug-mode-map take precedence
* lisp/emacs-lisp/edebug.el (edebug--recursive-edit): Bind minor-mode-overriding-map-alist to avoid other minor modes hiding the edebug commands (bug#11018).
-rw-r--r--lisp/emacs-lisp/edebug.el8
1 files changed, 6 insertions, 2 deletions
diff --git a/lisp/emacs-lisp/edebug.el b/lisp/emacs-lisp/edebug.el
index 2eceb823716..d01654927e7 100644
--- a/lisp/emacs-lisp/edebug.el
+++ b/lisp/emacs-lisp/edebug.el
@@ -2856,6 +2856,8 @@ See `edebug-behavior-alist' for implementations.")
2856(defvar edebug-inside-windows) 2856(defvar edebug-inside-windows)
2857(defvar edebug-interactive-p) 2857(defvar edebug-interactive-p)
2858 2858
2859(defvar edebug-mode-map) ; will be defined fully later.
2860
2859(defun edebug--recursive-edit (arg-mode) 2861(defun edebug--recursive-edit (arg-mode)
2860 ;; Start up a recursive edit inside of edebug. 2862 ;; Start up a recursive edit inside of edebug.
2861 ;; The current buffer is the edebug-buffer, which is put into edebug-mode. 2863 ;; The current buffer is the edebug-buffer, which is put into edebug-mode.
@@ -2902,6 +2904,10 @@ See `edebug-behavior-alist' for implementations.")
2902 ;; Don't get confused by the user's keymap changes. 2904 ;; Don't get confused by the user's keymap changes.
2903 (overriding-local-map nil) 2905 (overriding-local-map nil)
2904 (overriding-terminal-local-map nil) 2906 (overriding-terminal-local-map nil)
2907 ;; Override other minor modes that may bind the keys
2908 ;; edebug uses.
2909 (minor-mode-overriding-map-alist
2910 (list (cons 'edebug-mode edebug-mode-map)))
2905 2911
2906 ;; Bind again to outside values. 2912 ;; Bind again to outside values.
2907 (debug-on-error edebug-outside-debug-on-error) 2913 (debug-on-error edebug-outside-debug-on-error)
@@ -3561,8 +3567,6 @@ This is useful for exiting even if `unwind-protect' code may be executed."
3561 (edebug-Go-nonstop-mode . Go-nonstop)) 3567 (edebug-Go-nonstop-mode . Go-nonstop))
3562 "Association list between commands and the modes they set.") 3568 "Association list between commands and the modes they set.")
3563 3569
3564(defvar edebug-mode-map) ; will be defined fully later.
3565
3566(defun edebug-set-initial-mode () 3570(defun edebug-set-initial-mode ()
3567 "Set the initial execution mode of Edebug. 3571 "Set the initial execution mode of Edebug.
3568The mode is requested via the key that would be used to set the mode in 3572The mode is requested via the key that would be used to set the mode in