Merge from origin/emacs-26

86d2169 Avoid ridiculously high stack limit requests on macOS
ac3622c Improve documentation of 'read-hide-char'

# Conflicts:
#	src/emacs.c

diff --cc doc/lispref/minibuf.texi
Simple merge

diff --cc src/emacs.c
index b7a82793523dc7493e08f0cfa600cab4363345a1,f80047e89e7066d359a69e76e474987269209109..07df191035c80e6361ee038ea12a7688e1438a23
--- 1/src/emacs.c
--- 2/src/emacs.c
+++ b/src/emacs.c
@@@ -888,11 -883,12 +889,13 @@@ main (int argc, char **argv
                lim = newlim;
            }
        }
 -      /* If the stack is big enough, let regex.c more of it before
 -         falling back to heap allocation.  */
 +      /* If the stack is big enough, let regex-emacs.c use more of it
 +       before falling back to heap allocation.  */
+       if (lim < extra)
 -      lim = extra;    /* avoid wrap-around in unsigned subtraction */
 -      emacs_re_safe_alloca =
 -      max (min (lim - extra, SIZE_MAX) * (min_ratio / ratio), MAX_ALLOCA);
++        lim = extra;    /* avoid wrap-around in unsigned subtraction */
 +      ptrdiff_t max_failures
 +      = min (lim - extra, min (PTRDIFF_MAX, SIZE_MAX)) / ratio;
 +      emacs_re_safe_alloca = max (max_failures * min_ratio, MAX_ALLOCA);
      }
  #endif /* HAVE_SETRLIMIT and RLIMIT_STACK and not CYGWIN */
  

diff --cc src/minibuf.c
Simple merge