Merge remote-tracking branch 'origin/master' into feature/android

author Po Lu <luangruo@yahoo.com>

Sun, 8 Jan 2023 07:43:57 +0000 (15:43 +0800)

committer Po Lu <luangruo@yahoo.com>

Sun, 8 Jan 2023 07:43:57 +0000 (15:43 +0800)
author Po Lu <luangruo@yahoo.com>
Sun, 8 Jan 2023 07:43:57 +0000 (15:43 +0800)
committer Po Lu <luangruo@yahoo.com>
Sun, 8 Jan 2023 07:43:57 +0000 (15:43 +0800)
diff --cc configure.ac
Simple merge
diff --cc lib-src/Makefile.in
Simple merge
diff --cc lib/fpending.c
Simple merge
diff --cc src/Makefile.in
Simple merge
diff --cc src/fileio.c
Simple merge
diff --cc src/fns.c
Simple merge
diff --cc src/xdisp.c
Simple merge
author	Po Lu <luangruo@yahoo.com>
	Sun, 8 Jan 2023 07:43:57 +0000 (15:43 +0800)
committer	Po Lu <luangruo@yahoo.com>
	Sun, 8 Jan 2023 07:43:57 +0000 (15:43 +0800)
		1	2
configure.ac	patch \|	diff1 \|	diff2 \|	blob \| history
lib-src/Makefile.in	patch \|	diff1 \|	diff2 \|	blob \| history
lib/fpending.c	patch \|	diff1 \|	diff2 \|	blob \| history
src/Makefile.in	patch \|	diff1 \|	diff2 \|	blob \| history
src/fileio.c	patch \|	diff1 \|	diff2 \|	blob \| history
src/fns.c	patch \|	diff1 \|	diff2 \|	blob \| history
src/xdisp.c	patch \|	diff1 \|	diff2 \|	blob \| history