aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorEli Zaretskii1999-11-28 10:16:33 +0000
committerEli Zaretskii1999-11-28 10:16:33 +0000
commit59c65f1e9fa57f037276b70790b7e2ed0a0b0bce (patch)
treea204ad3e3984e08432a1aee89fb9543500d2ed53 /src
parentd01f35704121de41b33160e0ca4da02d7a300454 (diff)
downloademacs-59c65f1e9fa57f037276b70790b7e2ed0a0b0bce.tar.gz
emacs-59c65f1e9fa57f037276b70790b7e2ed0a0b0bce.zip
(synchronize_locale): Avoid compiler warnings about
pointer type mismatch.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog5
-rw-r--r--src/emacs.c2
2 files changed, 6 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 8083e880d6a..6c1fe1bcdbb 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
11999-11-28 Eli Zaretskii <eliz@is.elta.co.il>
2
3 * emacs.c (synchronize_locale): Avoid compiler warnings about
4 pointer type mismatch.
5
11999-11-26 Richard M. Stallman <rms@caffeine.ai.mit.edu> 61999-11-26 Richard M. Stallman <rms@caffeine.ai.mit.edu>
2 7
3 * editfns.c (Fdelete_field): Make it noninteractive. Return nil. 8 * editfns.c (Fdelete_field): Make it noninteractive. Return nil.
diff --git a/src/emacs.c b/src/emacs.c
index 91b0c773645..cb08e2f4413 100644
--- a/src/emacs.c
+++ b/src/emacs.c
@@ -1928,7 +1928,7 @@ synchronize_locale (category, plocale, desired_locale)
1928 { 1928 {
1929 *plocale = desired_locale; 1929 *plocale = desired_locale;
1930 setlocale (category, (STRINGP (desired_locale) 1930 setlocale (category, (STRINGP (desired_locale)
1931 ? XSTRING (desired_locale)->data 1931 ? (char *)(XSTRING (desired_locale)->data)
1932 : "")); 1932 : ""));
1933 } 1933 }
1934} 1934}