master updated (db7de56eef -> f97c3f9ced)

[Stefan Kangas]

skangas pushed a change to branch master.

      from  db7de56eef Simplify Haiku underline code
      adds  7eca80b204 ; * src/composite.c (syms_of_composite) 
<auto-composition-mode>: Doc fix.
       new  f97c3f9ced Merge from origin/emacs-28


Summary of changes:
 src/composite.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)