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

diff --cc .gitignore
Simple merge

diff --cc Makefile.in
Simple merge

diff --cc configure.ac
Simple merge

diff --cc lisp/faces.el
Simple merge

diff --cc lisp/loadup.el
Simple merge

diff --cc lisp/net/eww.el
Simple merge

diff --cc lisp/simple.el
Simple merge

diff --cc src/Makefile.in
index 5c6098bfed5d1703bfca904262661bb763812731,f3c545dba9aec94469449736a15f4864bc4548ce..39c077b694b40718e8703e8b1e24e8799b00c71a
--- 1/src/Makefile.in
--- 2/src/Makefile.in
+++ b/src/Makefile.in
@@@ -428,8 -400,8 +403,8 @@@ base_obj = dispnew.o frame.o scroll.o x
        profiler.o decompress.o \
        thread.o systhread.o \
        $(if $(HYBRID_MALLOC),sheap.o) \
 -      $(MSDOS_OBJ) $(MSDOS_X_OBJ) $(NS_OBJ) $(CYGWIN_OBJ) $(FONT_OBJ) \
 +      $(MSDOS_OBJ) $(MSDOS_X_OBJ) $(NS_OBJ) $(PGTK_OBJ) $(CYGWIN_OBJ) $(FONT_OBJ) \
-       $(W32_OBJ) $(WINDOW_SYSTEM_OBJ) $(XGSELOBJ) $(JSON_OBJ) $(GMP_OBJ)
+       $(W32_OBJ) $(WINDOW_SYSTEM_OBJ) $(XGSELOBJ) $(JSON_OBJ)
  obj = $(base_obj) $(NS_OBJC_OBJ)
  
  ## Object files used on some machine or other.

diff --cc src/alloc.c
Simple merge

diff --cc src/xdisp.c
Simple merge

diff --cc src/xfaces.c
Simple merge