From: Glenn Morris <rgm@gnu.org>
Date: Mon, 10 Dec 2018 17:43:05 +0000 (-0800)
Subject: ; Merge from origin/emacs-26
X-Git-Tag: emacs-27.0.90~4006
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=63838449521ca1abf5acb2c1b8ab59841a4b2727;p=emacs.git

; Merge from origin/emacs-26

The following commit was skipped:

ee1ebe8 Guard occur against an undefined orig-line
---

63838449521ca1abf5acb2c1b8ab59841a4b2727