Merge from origin/emacs-27

4b3085a7fe Fix last change
efdd4632c9 Fix Arabic shaping when column-number-mode is in effect
d5acc50941 Fix description of kmacro-* commands in the user manual

diff --cc src/composite.c
Simple merge

diff --cc src/indent.c
Simple merge