Merge remote-tracking branch 'origin/master' into feature/android

diff --cc admin/merge-gnulib
index 76e2a02558c5c81104aa71d3dcd9e443f2fa9d97,3e7526102aed7844e9446a013c7964096f784365..67bee62b764e970c739d495a327de1d9f98c5c10
--- 1/admin/merge-gnulib
--- 2/admin/merge-gnulib
+++ b/admin/merge-gnulib
@@@ -42,10 -42,10 +42,10 @@@ GNULIB_MODULES=
    manywarnings memmem-simple mempcpy memrchr memset_explicit
    minmax mkostemp mktime
    nanosleep nproc nstrftime
 -  pathmax pipe2 pselect pthread_sigmask
 +  pathmax pipe2 printf-posix vasprintf-posix pselect pthread_sigmask
    qcopy-acl readlink readlinkat regex
-   sig2str sigdescr_np socklen stat-time std-gnu11 stdbool stddef stdio
-   stpcpy stpncpy strnlen strtoimax symlink sys_stat sys_time
+   sig2str sigdescr_np socklen stat-time std-gnu11 stdbool stdckdint stddef stdio
 -  stpcpy strnlen strtoimax symlink sys_stat sys_time
++  stpcpy stpncpy strnlen strnlen strtoimax symlink sys_stat sys_time
    tempname time-h time_r time_rz timegm timer-time timespec-add timespec-sub
    update-copyright unlocked-io utimensat
    vla warnings year2038

diff --cc lib/gnulib.mk.in
Simple merge

diff --cc lisp/mail/rmail.el
Simple merge

diff --cc src/alloc.c
Simple merge

diff --cc src/buffer.c
Simple merge

diff --cc src/coding.c
Simple merge

diff --cc src/dispnew.c
Simple merge

diff --cc src/editfns.c
Simple merge

diff --cc src/emacs-module.c
index 3d06ef0020a84cddcaa9c05eb9ab8e80421bf7ec,10699ec25d91de04d8b0589783abcd8bfa3fda6e..86360a0f22544be30e98fec555ba2f8019bdfc77
--- 1/src/emacs-module.c
--- 2/src/emacs-module.c
+++ b/src/emacs-module.c
@@@ -437,10 -435,9 +437,10 @@@ module_make_global_ref (emacs_env *env
      {
        Lisp_Object value = HASH_VALUE (h, i);
        struct module_global_reference *ref = XMODULE_GLOBAL_REFERENCE (value);
-       bool overflow = INT_ADD_WRAPV (ref->refcount, 1, &ref->refcount);
+       bool overflow = ckd_add (&ref->refcount, ref->refcount, 1);
        if (overflow)
        overflow_error ();
 +      MODULE_INTERNAL_CLEANUP ();
        return &ref->value;
      }
    else

diff --cc src/fileio.c
Simple merge

diff --cc src/fns.c
Simple merge

diff --cc src/font.c
Simple merge

diff --cc src/frame.c
Simple merge

diff --cc src/image.c
Simple merge

diff --cc src/keyboard.c
Simple merge

diff --cc src/lisp.h
Simple merge

diff --cc src/lread.c
Simple merge

diff --cc src/term.c
Simple merge

diff --cc src/textconv.c
index e1a73e913971ab1e86e70be57921163570625425,7ed8ede35443b009435d66a357f1e999dc92554d..26f351dc72923fad58126d369a6f0362dee395f0
--- 1/src/textconv.c
--- 2/src/textconv.c
+++ b/src/textconv.c
@@@ -235,11 -125,9 +235,11 @@@ textconv_query (struct frame *f, struc
       overflows, move back to point or to the extremes of the
       accessible region.  */
  
-   if (INT_ADD_WRAPV (pos, query->position, &pos))
+   if (ckd_add (&pos, pos, query->position))
      pos = PT;
  
 + escape1:
 +
    if (pos < BEGV)
      pos = BEGV;
  

diff --cc src/xdisp.c
Simple merge

diff --cc src/xterm.c
Simple merge