]> git.eshelyaron.com Git - emacs.git/commitdiff
Merge from origin/emacs-27
authorGlenn Morris <rgm@gnu.org>
Tue, 15 Dec 2020 17:24:21 +0000 (09:24 -0800)
committerGlenn Morris <rgm@gnu.org>
Tue, 15 Dec 2020 17:24:21 +0000 (09:24 -0800)
668f0a7f84 Fix point location when completing in gdb-mi.el
2dbc95063b Update to Org 9.4.2
f22856a5c5 Update to Org 9.4.1

# Conflicts:
# doc/misc/org.texi
# lisp/org/ob-core.el
# lisp/org/ob-ruby.el
# lisp/org/ob-screen.el
# lisp/org/ol-gnus.el
# lisp/org/ol.el
# lisp/org/org.el

1  2 
doc/misc/org.texi
lisp/org/ob-screen.el
lisp/progmodes/gdb-mi.el

Simple merge
Simple merge
Simple merge