diff options
| author | Richard M. Stallman | 1996-04-08 23:12:25 +0000 |
|---|---|---|
| committer | Richard M. Stallman | 1996-04-08 23:12:25 +0000 |
| commit | 10537cb12d10a1d04a0214f4319e2969c0c5a59f (patch) | |
| tree | d3e0a95dbd4c8074213e5b30ce4cc0f1965e867b /src | |
| parent | c8644d7a4d2251b350f43cba5352c6d30a78ce58 (diff) | |
| download | emacs-10537cb12d10a1d04a0214f4319e2969c0c5a59f.tar.gz emacs-10537cb12d10a1d04a0214f4319e2969c0c5a59f.zip | |
Include locale.h if HAVE_SETLOCALE.
(x_term_init): Restore LC_TIME as well as LC_NUMERIC.
Diffstat (limited to 'src')
| -rw-r--r-- | src/xterm.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/xterm.c b/src/xterm.c index 080afbcccfb..62deeeb1e55 100644 --- a/src/xterm.c +++ b/src/xterm.c | |||
| @@ -105,7 +105,7 @@ extern void _XEditResCheckMessages (); | |||
| 105 | #endif | 105 | #endif |
| 106 | #endif | 106 | #endif |
| 107 | 107 | ||
| 108 | #ifdef HAVE_X11XTR6 | 108 | #ifdef HAVE_SETLOCALE |
| 109 | /* So we can do setlocale. */ | 109 | /* So we can do setlocale. */ |
| 110 | #include <locale.h> | 110 | #include <locale.h> |
| 111 | #endif | 111 | #endif |
| @@ -5891,6 +5891,7 @@ x_term_init (display_name, xrm_option, resource_name) | |||
| 5891 | setlocale (LC_ALL, ""); | 5891 | setlocale (LC_ALL, ""); |
| 5892 | /* In case we just overrode what init_lread did, redo it. */ | 5892 | /* In case we just overrode what init_lread did, redo it. */ |
| 5893 | setlocale (LC_NUMERIC, "C"); | 5893 | setlocale (LC_NUMERIC, "C"); |
| 5894 | setlocale (LC_TIME, "C"); | ||
| 5894 | #endif | 5895 | #endif |
| 5895 | 5896 | ||
| 5896 | #ifdef USE_X_TOOLKIT | 5897 | #ifdef USE_X_TOOLKIT |
| @@ -5920,6 +5921,7 @@ x_term_init (display_name, xrm_option, resource_name) | |||
| 5920 | &argc, argv); | 5921 | &argc, argv); |
| 5921 | 5922 | ||
| 5922 | #ifdef HAVE_X11XTR6 | 5923 | #ifdef HAVE_X11XTR6 |
| 5924 | /* I think this is to compensate for XtSetLanguageProc. */ | ||
| 5923 | setlocale (LC_NUMERIC, "C"); | 5925 | setlocale (LC_NUMERIC, "C"); |
| 5924 | setlocale (LC_TIME, "C"); | 5926 | setlocale (LC_TIME, "C"); |
| 5925 | #endif | 5927 | #endif |