From: Glenn Morris <rgm@gnu.org>
Date: Mon, 4 Jan 2021 15:50:26 +0000 (-0800)
Subject: Merge from origin/emacs-27
X-Git-Tag: emacs-28.0.90~4385
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=2c847902522ae74c9b25b2a3fa60565e0187fd0a;p=emacs.git

Merge from origin/emacs-27

99cc0045eb (origin/emacs-27) Update two user option names in the Widg...
---

2c847902522ae74c9b25b2a3fa60565e0187fd0a