]> git.eshelyaron.com Git - emacs.git/commitdiff
Merge from origin/emacs-29
authorEli Zaretskii <eliz@gnu.org>
Sat, 7 Oct 2023 07:48:00 +0000 (03:48 -0400)
committerEli Zaretskii <eliz@gnu.org>
Sat, 7 Oct 2023 07:48:00 +0000 (03:48 -0400)
a74e51cfd15 Fix a defcustom :type
c27b90d04bf Fix 'ido--ffap-find-file'
1594d5f17ad Fix setting the pipe capacity for subprocesses
aad8b5d78f3 Handle LANG on macOS differently (bug#65908)

# Conflicts:
# src/process.c

1  2 
lisp/ido.el
src/nsterm.m
src/process.c

diff --cc lisp/ido.el
Simple merge
diff --cc src/nsterm.m
Simple merge
diff --cc src/process.c
Simple merge