; Merge from origin/emacs-25
commit512b06e4309ba6c5cd3d2d2518a931b0664c4150
authorPaul Eggert <eggert@cs.ucla.edu>
Mon, 22 Aug 2016 21:38:50 +0000 (22 14:38 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Mon, 22 Aug 2016 21:38:50 +0000 (22 14:38 -0700)
tree2f3232e658c463648621731143e696847fe8a928
parentbde5e3fa83a0275bc6b54af23906fc3a8b313888
parent7d639f3be66e9b41f53e6349f8362ef0f1042e26
; Merge from origin/emacs-25

The following commit was skipped:

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