; Merge from origin/emacs-25
commit5f3aea8a10773dc481ed719034ea464573845ea1
authorPaul Eggert <eggert@cs.ucla.edu>
Mon, 22 Aug 2016 21:38:49 +0000 (22 14:38 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Mon, 22 Aug 2016 21:38:49 +0000 (22 14:38 -0700)
tree2e2452d22d54826cb84e2c5dc976abbb2ed40322
parent590dab5a68f4283d53ce79d4633fe1503131baea
parent4225b786746e170477ddd64deaf18facf11955f4
; Merge from origin/emacs-25

The following commit was skipped:

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