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

diff --cc configure.ac
Simple merge

diff --cc lisp/select.el
index a77a005cd3dcfa63702be14f98d0ea296e4b37c6,43424d94b3952d231984bf11a94b542998071608..5e7f4a696a3270825afa71732b8c0b714f3b5d48
--- 1/lisp/select.el
--- 2/lisp/select.el
+++ b/lisp/select.el
@@@ -312,14 -312,11 +315,12 @@@ the formats available in the clipboard 
                          selection-coding-system
                          (pcase data-type
                            ('UTF8_STRING 'utf-8)
 +                          ('text/plain\;charset=utf-8 'utf-8)
                            ('COMPOUND_TEXT 'compound-text-with-extensions)
                            ('C_STRING nil)
-                           ('STRING 'iso-8859-1)
-                           (_ (error "Unknown selection data type: %S"
-                                     type))))))
-         (setq data (if coding (decode-coding-string data coding)
-                      ;; This is for C_STRING case.
+                           ('STRING 'iso-8859-1)))))
+         (setq data
+               (cond (coding (decode-coding-string data coding))
                       ;; We want to convert each non-ASCII byte to the
                       ;; corresponding eight-bit character, which has
                       ;; a codepoint >= #x3FFF00.

diff --cc lisp/server.el
Simple merge

diff --cc lisp/startup.el
Simple merge

diff --cc src/emacsgtkfixed.c
Simple merge

diff --cc src/xfaces.c
Simple merge

diff --cc src/xwidget.c
Simple merge