upstream

diff --cc autogen/configure
index 919204c5da13ac4a785cc47d9d7889b0894b1188,26da95952fc6f4eea07a63cd4c26ebd6b72ed622..b7cee129757639bdea87a4e7adb391de33b13674
--- 1/autogen/configure
--- 2/autogen/configure
+++ b/autogen/configure
@@@ -4304,6 -4121,14 +4316,17 @@@ els
  fi
  
  
++<<<<<<< TREE
++=======
+ # Check whether --with-gsettings was given.
+ if test "${with_gsettings+set}" = set; then :
+   withval=$with_gsettings;
+ else
+      with_gsettings=$with_features
+ fi
+ 
+ 
++>>>>>>> MERGE-SOURCE
  # Check whether --with-selinux was given.
  if test "${with_selinux+set}" = set; then :
    withval=$with_selinux;
@@@ -7998,7 -7882,30 +8022,34 @@@ $as_echo "no" >&6; 
  fi
  
  
++<<<<<<< TREE
++
++=======
+   if test "X$PAXCTL" != X; then
+     { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether binaries have a PT_PAX_FLAGS header" >&5
+ $as_echo_n "checking whether binaries have a PT_PAX_FLAGS header... " >&6; }
+     cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
  
+ int
+ main ()
+ {
+ 
+   ;
+   return 0;
+ }
+ _ACEOF
+ if ac_fn_c_try_link "$LINENO"; then :
+   if $PAXCTL -v conftest$EXEEXT >/dev/null 2>&1; then { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+ $as_echo "yes" >&6; }
+       else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }; PAXCTL=""; fi
+ fi
+ rm -f core conftest.err conftest.$ac_objext \
+     conftest$ac_exeext conftest.$ac_ext
+   fi
+ fi
++>>>>>>> MERGE-SOURCE
  
  ## Need makeinfo >= 4.7 (?) to build the manuals.
  # Extract the first word of "makeinfo", so it can be a program name with args.
@@@ -22317,6 -23225,8 +22420,11 @@@ f
  
  
  
++<<<<<<< TREE
++=======
+ 
+ 
++>>>>>>> MERGE-SOURCE
       if test $gl_cv_have_include_next = yes; then
         gl_cv_next_unistd_h='<'unistd.h'>'
       else

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
Simple merge

diff --cc src/dispextern.h
Simple merge

diff --cc src/dispnew.c
index fc981eaa7c14d28963cad84f3e23326b2a00678b,b82761f8cadb5a4e69755c0362905d020be89060..506e174850e53b9585543b9c4431b9468edc55e0
--- 1/src/dispnew.c
--- 2/src/dispnew.c
+++ b/src/dispnew.c
@@@ -16,7 -16,11 +16,10 @@@ GNU General Public License for more det
  
  You should have received a copy of the GNU General Public License
  along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 -
  #include <config.h>
+ 
+ #define DISPEXTERN_INLINE EXTERN_INLINE
+ 
  #include <signal.h>
  #include <stdio.h>
  #include <ctype.h>

diff --cc src/emacs.c
Simple merge

diff --cc src/keyboard.c
Simple merge

diff --cc src/lisp.h
Simple merge

diff --cc src/print.c
Simple merge

diff --cc src/termhooks.h
Simple merge

diff --cc src/window.c
Simple merge

diff --cc src/xdisp.c
Simple merge

diff --cc src/xterm.c
Simple merge