; Merge from origin/emacs-25
commitd86bcedd880b3cb6383641082d406075aa6e70e2
authorPaul Eggert <eggert@cs.ucla.edu>
Sun, 19 Mar 2017 19:27:56 +0000 (19 12:27 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Sun, 19 Mar 2017 19:27:56 +0000 (19 12:27 -0700)
treee200fa9accae153426fb414cde550435d94cc58d
parent59ced4521ebdadaf48b9c22b7cda46407a8b942b
parent3993dc500d9b56723ced7530ead8d11c0ae42319
; Merge from origin/emacs-25

The following commit was skipped:

3993dc5 Fix auto-save-file-name problem in Tramp on MS Windows. Do no...