]> git.eshelyaron.com Git - emacs.git/commit
Merge from origin/emacs-28
authorStefan Kangas <stefan@marxist.se>
Fri, 10 Jun 2022 06:17:35 +0000 (08:17 +0200)
committerStefan Kangas <stefan@marxist.se>
Fri, 10 Jun 2022 06:17:35 +0000 (08:17 +0200)
commit17666093097d58466e9581b9ff1d07ec5e3eeebf
treefb52205fa16182ef4fa076eae74ee85bec36733b
parent8ac23bf0f6d1efc564b7086150cbadc11fba31a2
parentd02c94090c4dd7c90da9ccd3268a9e02cadf0a45
Merge from origin/emacs-28

d02c94090c Fix error reporting in process-async-https-with-delay
9a4862a973 * doc/misc/org.org: Remove spurious markup.
768ed1476a Make Tramp version check more robust
7f778c6943 Fix debugging with GDB when a breakpoint has multiple loca...
25e53e9391 ; * lisp/files.el (file-expand-wildcards): Doc fix.
3ea9357d10 Update documentation of 'aset' and 'store-substring'

# Conflicts:
# lisp/files.el
doc/lispref/strings.texi
lisp/files.el
lisp/net/trampver.el
lisp/progmodes/gdb-mi.el
test/src/process-tests.el