diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2011-01-30 14:22:58 -0800 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2011-01-30 14:22:58 -0800 |
| commit | 4eec7f8b2b465c6fc2c09d37d4da2b540f607df0 (patch) | |
| tree | 9f4e30300e4f96dd3c72f5f435032f8180ce1a6c /src/xdisp.c | |
| parent | fcabb1a6e66f7e6cf4fe0984c4d5c169f4decd8a (diff) | |
| parent | 42a5b22fc0201fe98ad8a093c3ab91122ab3a72b (diff) | |
| download | emacs-4eec7f8b2b465c6fc2c09d37d4da2b540f607df0.tar.gz emacs-4eec7f8b2b465c6fc2c09d37d4da2b540f607df0.tar.bz2 emacs-4eec7f8b2b465c6fc2c09d37d4da2b540f607df0.zip | |
Use SSDATA when the context wants char *.
Diffstat (limited to 'src/xdisp.c')
| -rw-r--r-- | src/xdisp.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/xdisp.c b/src/xdisp.c index 8ec12962e77..5f86a594968 100644 --- a/src/xdisp.c +++ b/src/xdisp.c @@ -2778,7 +2778,7 @@ init_from_display_pos (struct it *it, struct window *w, struct display_pos *pos) to 16 in 22.1 to make this a lesser problem. */ for (i = 0; i < it->n_overlay_strings && i < OVERLAY_STRING_CHUNK_SIZE; ++i) { - const char *s = SDATA (it->overlay_strings[i]); + const char *s = SSDATA (it->overlay_strings[i]); const char *e = s + SBYTES (it->overlay_strings[i]); while (s < e && *s != '\n') @@ -20077,7 +20077,7 @@ calc_pixel_width_or_height (double *res, struct it *it, Lisp_Object prop, { if (SCHARS (SYMBOL_NAME (prop)) == 2) { - char *unit = SDATA (SYMBOL_NAME (prop)); + char *unit = SSDATA (SYMBOL_NAME (prop)); if (unit[0] == 'i' && unit[1] == 'n') pixels = 1.0; |