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