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
This commit is contained in:
Stefan Kangas 2022-02-22 06:30:59 +01:00
commit bee54495e9
7 changed files with 30 additions and 12 deletions

View file

@ -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.