Mercurial > emacs
comparison src/emacs.c @ 112434:9de5a68b57e1
Promote SSDATA macro from gtkutil.c and xsmfns.c to lisp.h.
author | Paul Eggert <eggert@cs.ucla.edu> |
---|---|
date | Sat, 22 Jan 2011 18:56:06 -0800 |
parents | 42e22c4f06b7 |
children | b5017c649dfb |
comparison
equal
deleted
inserted
replaced
112433:7b649f6eac4f | 112434:9de5a68b57e1 |
---|---|
2203 { | 2203 { |
2204 if (! EQ (*plocale, desired_locale)) | 2204 if (! EQ (*plocale, desired_locale)) |
2205 { | 2205 { |
2206 *plocale = desired_locale; | 2206 *plocale = desired_locale; |
2207 setlocale (category, (STRINGP (desired_locale) | 2207 setlocale (category, (STRINGP (desired_locale) |
2208 ? (char *) SDATA (desired_locale) | 2208 ? SSDATA (desired_locale) |
2209 : "")); | 2209 : "")); |
2210 } | 2210 } |
2211 } | 2211 } |
2212 | 2212 |
2213 /* Set system time locale to match Vsystem_time_locale, if possible. */ | 2213 /* Set system time locale to match Vsystem_time_locale, if possible. */ |
2488 Fput (intern_c_string ("dynamic-library-alist"), Qrisky_local_variable, Qt); | 2488 Fput (intern_c_string ("dynamic-library-alist"), Qrisky_local_variable, Qt); |
2489 | 2489 |
2490 /* Make sure IS_DAEMON starts up as false. */ | 2490 /* Make sure IS_DAEMON starts up as false. */ |
2491 daemon_pipe[1] = 0; | 2491 daemon_pipe[1] = 0; |
2492 } | 2492 } |
2493 |