Merge from origin/emacs-28
authorPo Lu <luangruo@yahoo.com>
Sat, 29 Jan 2022 12:37:24 +0000 (20:37 +0800)
committerPo Lu <luangruo@yahoo.com>
Sat, 29 Jan 2022 12:37:24 +0000 (20:37 +0800)
commit04bba4a28f959cb202e7fb993b619c7358084ec3
tree26e188f9b955b72837a3679b9d5896fea6f6702b
parenta85e9d76414123a0cdd547edaf87de97436b1f46
parent611736f3bc5d9f410adef4cc175c7f9b1c015f2c
Merge from origin/emacs-28

611736f3bc Remove debug logging
ddba3c3dba Fix error in filelock.c

# Conflicts:
# src/filelock.c
src/filelock.c
src/nsterm.m