Merge from mainline.
authorEli Zaretskii <eliz@gnu.org>
Mon, 18 Nov 2013 16:45:48 +0000 (18:45 +0200)
committerEli Zaretskii <eliz@gnu.org>
Mon, 18 Nov 2013 16:45:48 +0000 (18:45 +0200)
commit18b35e2c7a3ff95fb4a07e58c3f57c70c65c0701
tree7a837a755a7c22d3258408cb384d01479ad88232
parentdf87c56cdf6c8c13e8760bdc409e2eb0fda55b0b
parent37c790b38599cc80a16c6a76152abbf8160fe2a1
Merge from mainline.
src/coding.c
src/emacs.c
src/fileio.c
src/msdos.c
src/w32.c
src/w32fns.c
src/w32term.c