master updated (b5ac604b15 -> 3af12cb8f2)

[Stefan Kangas]

skangas pushed a change to branch master.

      from  b5ac604b15 Fix some issues with input methods that depend on button 
state
      adds  a9920473f6 Improve documentation of 'map-charset-chars'
      adds  dbe6a3ecf7 Fix regression in 
'custom-prompt-customize-unsaved-options'
       new  3af12cb8f2 Merge from origin/emacs-28


Summary of changes:
 doc/lispref/nonascii.texi | 15 ++++++++++++---
 lisp/cus-edit.el          |  8 ++++----
 src/charset.c             | 25 +++++++++++++++----------
 3 files changed, 31 insertions(+), 17 deletions(-)