From: Paul Eggert <eggert@cs.ucla.edu>
Date: Mon, 22 Aug 2016 21:38:49 +0000 (-0700)
Subject: ; Merge from origin/emacs-25
X-Git-Tag: emacs-26.0.90~1707
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=5f3aea8a10773dc481ed719034ea464573845ea1;p=emacs.git

; Merge from origin/emacs-25

The following commit was skipped:

4225b78 Avoid segfaults due to quoting in 'substitute-command-keys'
---

5f3aea8a10773dc481ed719034ea464573845ea1