upstream

diff --cc configure.ac
Simple merge

diff --cc lisp/emacs-lisp/cl-macs.el
Simple merge

diff --cc lisp/emacs-lisp/cl.el
Simple merge

diff --cc src/Makefile.in
index 20e9366592d467e5464b41e9eb4cdf4eb0caa487,c24e421bbbc6528890ddf5e515894f4ace3b93f1,d034ad047960e30a2a368402db648171176c084f..88e1fc544d0d1b772189e197a92a4196b79ce6ad
--- 1/src/Makefile.in
--- 2/src/Makefile.in
--- 3/src/Makefile.in
+++ b/src/Makefile.in
@@@@ -404,8 -392,7 -393,7 +405,8 @@@@ otherobj= $(TERMCAP_OBJ) $(PRE_ALLOC_OB
   LIBES = $(LIBS) $(W32_LIBS) $(LIBX_BASE) $(LIBIMAGE) \
      $(LIBX_OTHER) $(LIBSOUND) \
      $(RSVG_LIBS) $(IMAGEMAGICK_LIBS) $(LIB_CLOCK_GETTIME) \
 -    $(LIB_TIMER_TIME) $(DBUS_LIBS) \
 ++   $(WEBKIT_LIBS) $(CLUTTER_LIBS) $(GIR_LIBS) \
-     $(LIB_TIMER_TIME) $(DBUS_LIBS) \
++    $(LIB_EACCESS) $(LIB_TIMER_TIME) $(DBUS_LIBS) \
      $(LIB_EXECINFO) \
      $(LIBXML2_LIBS) $(LIBGPM) $(LIBRESOLV) $(LIBS_SYSTEM) \
      $(LIBS_TERMCAP) $(GETLOADAVG_LIBS) $(SETTINGS_LIBS) $(LIBSELINUX_LIBS) \

diff --cc src/dispnew.c
Simple merge

diff --cc src/emacs.c
Simple merge

diff --cc src/keyboard.c
Simple merge

diff --cc src/lisp.h
Simple merge

diff --cc src/xdisp.c
Simple merge