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

diff --cc Makefile.in
index 2aba179b0906c8fffbd920fdeb795ca3fa2fd4cc,97d954b6ce56a9fb436a29ddd8e9345731f90097..24684e5d075ab0e27c36f727dbc7439138f25c86
--- 1/Makefile.in
--- 2/Makefile.in
+++ b/Makefile.in
@@@ -333,14 -333,12 +338,14 @@@ BIN_DESTDIR='$(DESTDIR)${bindir}/
  ELN_DESTDIR = $(DESTDIR)${libdir}/emacs/${version}/
  else
  BIN_DESTDIR='${ns_appbindir}/'
- ELN_DESTDIR = ${ns_appresdir}/
+ ELN_DESTDIR = ${ns_applibdir}/
  endif
  
 -all: ${SUBDIR} info
 +gsettings_SCHEMAS = etc/org.gnu.emacs.defaults.gschema.xml
 +
 +all: ${SUBDIR} info $(gsettings_SCHEMAS:.xml=.valid)
  
- .PHONY: all ${SUBDIR} blessmail epaths-force epaths-force-w32 etc-emacsver
+ .PHONY: all ${SUBDIR} blessmail epaths-force epaths-force-w32 epaths-force-ns-self-contained etc-emacsver
  
  # If configure were to just generate emacsver.tex from emacsver.tex.in
  # in the normal way, the timestamp of emacsver.tex would always be

diff --cc configure.ac
Simple merge

diff --cc lisp/server.el
Simple merge

diff --cc lisp/simple.el
Simple merge

diff --cc src/Makefile.in
Simple merge

diff --cc src/emacs.c
Simple merge

diff --cc src/process.c
Simple merge