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

; Merge from origin/emacs-25

The following commit was skipped:

7d639f3 * src/doc.c (Fsubstitute_command_keys): Another fix for smart...
---

512b06e4309ba6c5cd3d2d2518a931b0664c4150