HCoop
/
bpt
/
emacs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Promote SSDATA macro from gtkutil.c and xsmfns.c to lisp.h.
[bpt/emacs.git]
/
src
/
emacs.c
diff --git
a/src/emacs.c
b/src/emacs.c
index
304f87e
..
70dd76d
100644
(file)
--- a/
src/emacs.c
+++ b/
src/emacs.c
@@
-2205,7
+2205,7
@@
synchronize_locale (int category, Lisp_Object *plocale, Lisp_Object desired_loca
{
*plocale = desired_locale;
setlocale (category, (STRINGP (desired_locale)
- ?
(char *)
SDATA (desired_locale)
+ ?
S
SDATA (desired_locale)
: ""));
}
}
@@
-2490,4
+2490,3
@@
libraries; only those already known by Emacs will be loaded. */);
/* Make sure IS_DAEMON starts up as false. */
daemon_pipe[1] = 0;
}
-