Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs into feature/pgtk

diff --cc Makefile.in
index 059ce1a8f7fefa664c851d769c9250e5eaee326a,f04ba0c5c9d7abb87ce4c65938991051428ff375..64ad53abbf9b02c88e23435145d5ae587b4c6799
--- 1/Makefile.in
--- 2/Makefile.in
+++ b/Makefile.in
@@@ -845,8 -838,7 +845,7 @@@ clean_dirs = $(mostlyclean_dirs) nextst
  
  $(foreach dir,$(clean_dirs),$(eval $(call submake_template,$(dir),clean)))
  
 -clean: $(clean_dirs:=_clean)
 +clean: $(clean_dirs:=_clean) clean-gsettings-schemas
-       $(MAKE) -C admin/charsets $@
        [ ! -d test ] || $(MAKE) -C test $@
        -rm -f ./*.tmp etc/*.tmp*
        -rm -rf info-dir.*

diff --cc configure.ac
Simple merge

diff --cc lisp/international/mule-cmds.el
Simple merge

diff --cc lisp/startup.el
Simple merge

diff --cc src/frame.c
Simple merge

diff --cc src/keyboard.c
Simple merge

diff --cc src/xdisp.c
Simple merge