diff options
| author | Paul Eggert | 2011-01-22 18:56:06 -0800 |
|---|---|---|
| committer | Paul Eggert | 2011-01-22 18:56:06 -0800 |
| commit | 51b59d794fe1d4a82fcd842b478657cc93f91595 (patch) | |
| tree | 25e57573403a13f3fe70934b40bf38c0190fd5ed /src/xselect.c | |
| parent | 9e928ac989c824c376b1ab576a6da69cd86b12c6 (diff) | |
| download | emacs-51b59d794fe1d4a82fcd842b478657cc93f91595.tar.gz emacs-51b59d794fe1d4a82fcd842b478657cc93f91595.zip | |
Promote SSDATA macro from gtkutil.c and xsmfns.c to lisp.h.
Diffstat (limited to 'src/xselect.c')
| -rw-r--r-- | src/xselect.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/xselect.c b/src/xselect.c index 0f57677a302..9031bd03f64 100644 --- a/src/xselect.c +++ b/src/xselect.c | |||
| @@ -235,9 +235,9 @@ symbol_to_x_atom (struct x_display_info *dpyinfo, Display *display, Lisp_Object | |||
| 235 | if (EQ (sym, QNULL)) return dpyinfo->Xatom_NULL; | 235 | if (EQ (sym, QNULL)) return dpyinfo->Xatom_NULL; |
| 236 | if (!SYMBOLP (sym)) abort (); | 236 | if (!SYMBOLP (sym)) abort (); |
| 237 | 237 | ||
| 238 | TRACE1 (" XInternAtom %s", (char *) SDATA (SYMBOL_NAME (sym))); | 238 | TRACE1 (" XInternAtom %s", SSDATA (SYMBOL_NAME (sym))); |
| 239 | BLOCK_INPUT; | 239 | BLOCK_INPUT; |
| 240 | val = XInternAtom (display, (char *) SDATA (SYMBOL_NAME (sym)), False); | 240 | val = XInternAtom (display, SSDATA (SYMBOL_NAME (sym)), False); |
| 241 | UNBLOCK_INPUT; | 241 | UNBLOCK_INPUT; |
| 242 | return val; | 242 | return val; |
| 243 | } | 243 | } |
| @@ -2255,7 +2255,7 @@ x_fill_property_data (Display *dpy, Lisp_Object data, void *ret, int format) | |||
| 2255 | else if (STRINGP (o)) | 2255 | else if (STRINGP (o)) |
| 2256 | { | 2256 | { |
| 2257 | BLOCK_INPUT; | 2257 | BLOCK_INPUT; |
| 2258 | val = (long) XInternAtom (dpy, (char *) SDATA (o), False); | 2258 | val = (long) XInternAtom (dpy, SSDATA (o), False); |
| 2259 | UNBLOCK_INPUT; | 2259 | UNBLOCK_INPUT; |
| 2260 | } | 2260 | } |
| 2261 | else | 2261 | else |
| @@ -2392,7 +2392,7 @@ FRAME is on. If FRAME is nil, the selected frame is used. */) | |||
| 2392 | else if (STRINGP (atom)) | 2392 | else if (STRINGP (atom)) |
| 2393 | { | 2393 | { |
| 2394 | BLOCK_INPUT; | 2394 | BLOCK_INPUT; |
| 2395 | x_atom = XInternAtom (FRAME_X_DISPLAY (f), (char *) SDATA (atom), False); | 2395 | x_atom = XInternAtom (FRAME_X_DISPLAY (f), SSDATA (atom), False); |
| 2396 | UNBLOCK_INPUT; | 2396 | UNBLOCK_INPUT; |
| 2397 | } | 2397 | } |
| 2398 | else | 2398 | else |