; Merge from origin/emacs-25
commitdee6981c8de6347ef66a9a1c37d65c43a9a8c4a6
authorPaul Eggert <eggert@cs.ucla.edu>
Tue, 17 Jan 2017 15:32:13 +0000 (17 07:32 -0800)
committerPaul Eggert <eggert@cs.ucla.edu>
Tue, 17 Jan 2017 15:32:13 +0000 (17 07:32 -0800)
tree7b50f8d0271c323b7994837e33e8d64c2db3df37
parent5362ef79cbb195f9df38f71b4d64e290cd7d9f50
parent8dd624c8ac179d5381e00c04358d353866f60f9f
; Merge from origin/emacs-25

The following commit was skipped:

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