From: Paul Eggert <eggert@cs.ucla.edu>
Date: Sun, 5 Jan 2020 19:44:48 +0000 (-0800)
Subject: Merge from origin/emacs-27
X-Git-Tag: emacs-28.0.90~7908^2~165
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=f9094332287cf1434788f6407347265350ae5dd5;p=emacs.git

Merge from origin/emacs-27

448df8fec7 Improve doc-strings of 'quit-window' and 'quit-restore-win...
7f01dfca56 Fix MH-E bug #470: Show buffer discards text properties
f95a2b8301 Fix some broken conditional forms
28727444f1 Fix a scoping error in tramp-sudoedit.el
6cbdd048bd * lisp/autorevert.el (auto-revert-notify-handler): Fix bra...
076dd1f69a Fix typo in 'window_box_height'
---

f9094332287cf1434788f6407347265350ae5dd5