From: Po Lu <luangruo@yahoo.com>
Date: Thu, 18 May 2023 01:04:57 +0000 (+0800)
Subject: Merge remote-tracking branch 'origin/master' into feature/android
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=074c0268fd32d6527e124cff386bb6b15cf90017;p=emacs.git

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

074c0268fd32d6527e124cff386bb6b15cf90017
diff --cc admin/merge-gnulib
index 76e2a02558c,3e7526102ae..67bee62b764
--- a/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 src/emacs-module.c
index 3d06ef0020a,10699ec25d9..86360a0f225
--- a/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/textconv.c
index e1a73e91397,7ed8ede3544..26f351dc729
--- a/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;