summaryrefslogtreecommitdiff
path: root/src/emacs.c
diff options
context:
space:
mode:
authorPaul Eggert <eggert@cs.ucla.edu>2011-01-30 14:17:44 -0800
committerPaul Eggert <eggert@cs.ucla.edu>2011-01-30 14:17:44 -0800
commit42a5b22fc0201fe98ad8a093c3ab91122ab3a72b (patch)
treee9e37d432417ac382a36b9e6f26db38e59ca0585 /src/emacs.c
parent3de84ad9c45382c181e3383d433442f4e19ba722 (diff)
downloademacs-42a5b22fc0201fe98ad8a093c3ab91122ab3a72b.tar.gz
emacs-42a5b22fc0201fe98ad8a093c3ab91122ab3a72b.tar.bz2
emacs-42a5b22fc0201fe98ad8a093c3ab91122ab3a72b.zip
Use SSDATA when the context wants char *.
* alloc.c, buffer.c, bytecode.c, callproc.c, dired.c: * dispnew.c, doc.c, editfns.c, emacs.c, fileio.c, filelock.c: * fns.c, font.c, frame.c, image.c, indent.c, keyboard.c: * lread.c, minibuf.c, print.c, process.c, search.c, widget.c: * xdisp.c, xfaces.c, xfns.c, xml.c, xselect.c, xterm.c: Use SSDATA (not SDATA) when the context of the expression wants char * (not unsigned char *).
Diffstat (limited to 'src/emacs.c')
-rw-r--r--src/emacs.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/emacs.c b/src/emacs.c
index ae3c318c07f..e696c820298 100644
--- a/src/emacs.c
+++ b/src/emacs.c
@@ -755,8 +755,8 @@ main (int argc, char **argv)
}
else
{
- version = SDATA (tem);
- copyright = SDATA (tem2);
+ version = SSDATA (tem);
+ copyright = SSDATA (tem2);
}
}
else
@@ -1988,7 +1988,7 @@ all of which are called before Emacs is actually killed. */)
kill it because we are exiting Emacs deliberately (not crashing).
Do it after shut_down_emacs, which does an auto-save. */
if (STRINGP (Vauto_save_list_file_name))
- unlink (SDATA (Vauto_save_list_file_name));
+ unlink (SSDATA (Vauto_save_list_file_name));
exit (INTEGERP (arg) ? XINT (arg) : EXIT_SUCCESS);
}
@@ -2169,7 +2169,7 @@ You must run Emacs in batch mode in order to dump it. */)
#ifdef USE_MMAP_FOR_BUFFERS
mmap_set_vars (0);
#endif
- unexec (SDATA (filename), !NILP (symfile) ? SDATA (symfile) : 0);
+ unexec (SSDATA (filename), !NILP (symfile) ? SSDATA (symfile) : 0);
#ifdef USE_MMAP_FOR_BUFFERS
mmap_set_vars (1);
#endif