From: Stefan Monnier <monnier@iro.umontreal.ca>
Date: Fri, 23 Mar 2018 15:01:31 +0000 (-0400)
Subject: ; Merge from origin/emacs-26
X-Git-Tag: emacs-27.0.90~5424
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=8e5ab342aac11ccc54fdcdc9593e989b562f7ae7;p=emacs.git

; Merge from origin/emacs-26

The following commit was skipped:

7c993c34b0 sql.el defcustom fixes
---

8e5ab342aac11ccc54fdcdc9593e989b562f7ae7