upstream

diff --cc configure.ac
Simple merge

diff --cc lisp/emacs-lisp/cl-loaddefs.el
index d4da1f59a8539f9ba6860b9ee08517e7eda7f842,c12e8ccacb15468e4edd4dec92cb2cb15c4d8838..f2bc7cc9d3c91f357be3c483da47728c1d578399
--- 1/lisp/emacs-lisp/cl-loaddefs.el
--- 2/lisp/emacs-lisp/cl-loaddefs.el
+++ b/lisp/emacs-lisp/cl-loaddefs.el
@@@ -260,9 -259,20 +259,20 @@@ Remove from SYMBOL's plist the propert
  ;;;;;;  cl-do cl-loop cl-return-from cl-return cl-block cl-etypecase
  ;;;;;;  cl-typecase cl-ecase cl-case cl-load-time-value cl-eval-when
  ;;;;;;  cl-destructuring-bind cl-function cl-defmacro cl-defun cl-gentemp
- ;;;;;;  cl-gensym) "cl-macs" "cl-macs.el" "a1ca04b3f2acc7c9b06f45ef5486d443")
+ ;;;;;;  cl-gensym cl--compiler-macro-cXXr cl--compiler-macro-list*)
 -;;;;;;  "cl-macs" "cl-macs.el" "6d0676869af66e5b5a671f95ee069461")
++;;;;;;  "cl-macs" "cl-macs.el" "00526d56a1062b9c308cf37b59374f2b")
  ;;; Generated autoloads from cl-macs.el
  
+ (autoload 'cl--compiler-macro-list* "cl-macs" "\
+ 
+ 
+ \(fn FORM ARG &rest OTHERS)" nil nil)
+ 
+ (autoload 'cl--compiler-macro-cXXr "cl-macs" "\
+ 
+ 
+ \(fn FORM X)" nil nil)
+ 
  (autoload 'cl-gensym "cl-macs" "\
  Generate a new uninterned symbol.
  The name is made by appending a number to PREFIX, default \"G\".

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

diff --cc lisp/net/browse-url.el
Simple merge

diff --cc src/dispnew.c
Simple merge

diff --cc src/emacs.c
Simple merge

diff --cc src/emacsgtkfixed.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/window.c
Simple merge

diff --cc src/xdisp.c
index fcd76c946818fd9c625ccb9fe0b9d06cd1409cdf,bec9ec91d2fa09c4fe072f550103bf0106f14555..df402cd106ead12bd536c4b1b74154a3a2f5ddbb
--- 1/src/xdisp.c
--- 2/src/xdisp.c
+++ b/src/xdisp.c
@@@ -7344,10 -7304,10 +7345,10 @@@ set_iterator_to_next (struct it *it, in
        if (it->method == GET_FROM_STRING)
        goto consider_string_end;
        break;
 -
 +#endif
      default:
        /* There are no other methods defined, so this should be a bug.  */
-       abort ();
+       emacs_abort ();
      }
  
    eassert (it->method != GET_FROM_STRING

diff --cc src/xterm.c
Simple merge