diff options
author | Stefan Kangas <stefan@marxist.se> | 2022-02-22 06:30:59 +0100 |
---|---|---|
committer | Stefan Kangas <stefan@marxist.se> | 2022-02-22 06:30:59 +0100 |
commit | bee54495e92ddf5d75e3f68ac7e823b221306719 (patch) | |
tree | 3469a04a9a7117c7e546e16605b543777d6d3d77 /lisp/emacs-lisp/edebug.el | |
parent | 6b0e23412d367a3b90db01de9456431158525938 (diff) | |
parent | 666e40a109ea6c0079467e72c806bb04191ff4cc (diff) | |
download | emacs-bee54495e92ddf5d75e3f68ac7e823b221306719.tar.gz emacs-bee54495e92ddf5d75e3f68ac7e823b221306719.tar.bz2 emacs-bee54495e92ddf5d75e3f68ac7e823b221306719.zip |
Merge from origin/emacs-28
666e40a109 Fix 'display-line-numbers-mode' in hide-show buffers
68d134cf0f Don't check whether a deleted window is deletable (Bug#54028)
b38223a844 A friendlier error message from image-mode in an empty buffer
b7a651ba37 Update to Org 9.5.2-17-gea6b74
3a8c3f7abd ; Don't reference obsolete variables in edebug.el
Diffstat (limited to 'lisp/emacs-lisp/edebug.el')
-rw-r--r-- | lisp/emacs-lisp/edebug.el | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/lisp/emacs-lisp/edebug.el b/lisp/emacs-lisp/edebug.el index a7e71d2ed24..722283b88ff 100644 --- a/lisp/emacs-lisp/edebug.el +++ b/lisp/emacs-lisp/edebug.el @@ -3914,8 +3914,8 @@ Also see bindings for the eval list buffer *edebug* in `edebug-eval-mode'. The edebug buffer commands: \\{edebug-mode-map} -Global commands prefixed by `global-edebug-prefix': -\\{global-edebug-map} +Global commands prefixed by `edebug-global-prefix': +\\{edebug-global-map} Options: `edebug-setup-hook' @@ -4082,8 +4082,8 @@ buffer and \\<global-map>\\[edebug-step-mode] in any buffer. Eval list buffer commands: \\{edebug-eval-mode-map} -Global commands prefixed by `global-edebug-prefix': -\\{global-edebug-map}") +Global commands prefixed by `edebug-global-prefix': +\\{edebug-global-map}") ;;; Interface with standard debugger. |