]> git.eshelyaron.com Git - emacs.git/commitdiff
Merge from origin/emacs-28
authorPo Lu <luangruo@yahoo.com>
Fri, 4 Mar 2022 00:52:18 +0000 (00:52 +0000)
committerPo Lu <luangruo@yahoo.com>
Fri, 4 Mar 2022 00:52:18 +0000 (00:52 +0000)
29ff903bb0 Avoid crashes when fringe bitmaps are defined in daemon mode
92e2d19fe7 One more fix of the BPA implementation
cd51d9c7ab Fix handling of brackets in BPA

1  2 
src/bidi.c
src/dispextern.h
src/fringe.c
src/w32term.c
src/xterm.c

diff --cc src/bidi.c
Simple merge
Simple merge
diff --cc src/fringe.c
Simple merge
diff --cc src/w32term.c
Simple merge
diff --cc src/xterm.c
Simple merge