]> git.eshelyaron.com Git - emacs.git/commitdiff
Merge from origin/emacs-26
authorGlenn Morris <rgm@gnu.org>
Fri, 1 Mar 2019 17:40:22 +0000 (09:40 -0800)
committerGlenn Morris <rgm@gnu.org>
Fri, 1 Mar 2019 17:40:22 +0000 (09:40 -0800)
dee3cdc Minor improvement for docs of completion
c86d419 ; * src/image.c (imagemagick_load, svg_load): Fix typos in co...
6d46fa9 Disable the timerfd interface on Cygwin
3707ea4 Fix a typo in the doc string of 'regex-opt'
d9905d5 Document bash 5.0.0 misbehavior in tramp.texi (Bug#34192)

# Conflicts:
# doc/misc/tramp.texi

1  2 
configure.ac
doc/lispref/minibuf.texi
doc/misc/tramp.texi
src/image.c

diff --cc configure.ac
Simple merge
Simple merge
Simple merge
diff --cc src/image.c
Simple merge