From: Paul Eggert <eggert@cs.ucla.edu>
Date: Tue, 17 Jan 2017 15:32:13 +0000 (-0800)
Subject: ; Merge from origin/emacs-25
X-Git-Tag: emacs-26.0.90~870^2~105
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=dee6981c8de6347ef66a9a1c37d65c43a9a8c4a6;p=emacs.git

; Merge from origin/emacs-25

The following commit was skipped:

8dd624c Document that functions in 'ffap-alist' can use the match data
---

dee6981c8de6347ef66a9a1c37d65c43a9a8c4a6