diff options
| author | Paul Eggert | 2017-02-23 09:14:06 -0800 |
|---|---|---|
| committer | Paul Eggert | 2017-02-23 09:15:06 -0800 |
| commit | 7204577bf90ba8574a0199680626a5ae3f075554 (patch) | |
| tree | 46062d3c37fa6cc291b9e0ce25a2f28992217094 /src | |
| parent | 23e64facf9f74133c6bacedeec56ad782ae69b65 (diff) | |
| download | emacs-7204577bf90ba8574a0199680626a5ae3f075554.tar.gz emacs-7204577bf90ba8574a0199680626a5ae3f075554.zip | |
Merge from gnulib
This incorporates:
2017-02-16 xbinary-io: rename from xsetmode
2017-02-15 xsetmode: new module
* lib-src/etags.c (main):
* lib-src/hexl.c (main):
* src/emacs.c (main) [MSDOS]:
Prefer set_binary_mode to the obsolescent SET_BINARY.
* lib/binary-io.c, lib/binary-io.h: Copy from gnulib.
Diffstat (limited to 'src')
| -rw-r--r-- | src/emacs.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/emacs.c b/src/emacs.c index e5305e27417..a72f1810d8a 100644 --- a/src/emacs.c +++ b/src/emacs.c | |||
| @@ -894,9 +894,9 @@ main (int argc, char **argv) | |||
| 894 | #endif /* not SYSTEM_MALLOC and not HYBRID_MALLOC */ | 894 | #endif /* not SYSTEM_MALLOC and not HYBRID_MALLOC */ |
| 895 | 895 | ||
| 896 | #ifdef MSDOS | 896 | #ifdef MSDOS |
| 897 | SET_BINARY (fileno (stdin)); | 897 | set_binary_mode (STDIN_FILENO, O_BINARY); |
| 898 | fflush (stdout); | 898 | fflush (stdout); |
| 899 | SET_BINARY (fileno (stdout)); | 899 | set_binary_mode (STDOUT_FILENO, O_BINARY); |
| 900 | #endif /* MSDOS */ | 900 | #endif /* MSDOS */ |
| 901 | 901 | ||
| 902 | /* Skip initial setlocale if LC_ALL is "C", as it's not needed in that case. | 902 | /* Skip initial setlocale if LC_ALL is "C", as it's not needed in that case. |