Merge from origin/emacs-28

dbe6a3ecf7 Fix regression in 'custom-prompt-customize-unsaved-options'
a9920473f6 Improve documentation of 'map-charset-chars'

diff --cc lisp/cus-edit.el
Simple merge

diff --cc src/charset.c
Simple merge