]> git.eshelyaron.com Git - emacs.git/commitdiff
Merge from origin/emacs-28
authorStefan Kangas <stefan@marxist.se>
Tue, 22 Feb 2022 05:30:59 +0000 (06:30 +0100)
committerStefan Kangas <stefan@marxist.se>
Tue, 22 Feb 2022 05:30:59 +0000 (06:30 +0100)
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

1  2 
lisp/emacs-lisp/edebug.el
lisp/image-mode.el
lisp/window.el
src/xdisp.c

Simple merge
Simple merge
diff --cc lisp/window.el
Simple merge
diff --cc src/xdisp.c
Simple merge