From: Glenn Morris <rgm@gnu.org>
Date: Tue, 15 Dec 2020 17:24:21 +0000 (-0800)
Subject: Merge from origin/emacs-27
X-Git-Tag: emacs-28.0.90~4691
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=cbdd48a07be5401177807ed6e6b8ec16c1b5e004;p=emacs.git

Merge from origin/emacs-27

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
---

cbdd48a07be5401177807ed6e6b8ec16c1b5e004