Mercurial > emacs
comparison src/callproc.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 |
comparison
equal
deleted
inserted
replaced
112433:7b649f6eac4f | 112434:9de5a68b57e1 |
---|---|
1276 #endif /* not WINDOWSNT */ | 1276 #endif /* not WINDOWSNT */ |
1277 ) | 1277 ) |
1278 { | 1278 { |
1279 if (SBYTES (entry) > varlen && SREF (entry, varlen) == '=') | 1279 if (SBYTES (entry) > varlen && SREF (entry, varlen) == '=') |
1280 { | 1280 { |
1281 *value = (char *) SDATA (entry) + (varlen + 1); | 1281 *value = SSDATA (entry) + (varlen + 1); |
1282 *valuelen = SBYTES (entry) - (varlen + 1); | 1282 *valuelen = SBYTES (entry) - (varlen + 1); |
1283 return 1; | 1283 return 1; |
1284 } | 1284 } |
1285 else if (SBYTES (entry) == varlen) | 1285 else if (SBYTES (entry) == varlen) |
1286 { | 1286 { |
1308 { | 1308 { |
1309 Lisp_Object display | 1309 Lisp_Object display |
1310 = Fframe_parameter (NILP (frame) ? selected_frame : frame, Qdisplay); | 1310 = Fframe_parameter (NILP (frame) ? selected_frame : frame, Qdisplay); |
1311 if (STRINGP (display)) | 1311 if (STRINGP (display)) |
1312 { | 1312 { |
1313 *value = (char *) SDATA (display); | 1313 *value = SSDATA (display); |
1314 *valuelen = SBYTES (display); | 1314 *valuelen = SBYTES (display); |
1315 return 1; | 1315 return 1; |
1316 } | 1316 } |
1317 /* If still not found, Look for DISPLAY in Vinitial_environment. */ | 1317 /* If still not found, Look for DISPLAY in Vinitial_environment. */ |
1318 if (getenv_internal_1 (var, varlen, value, valuelen, | 1318 if (getenv_internal_1 (var, varlen, value, valuelen, |
1592 | 1592 |
1593 defsubr (&Scall_process); | 1593 defsubr (&Scall_process); |
1594 defsubr (&Sgetenv_internal); | 1594 defsubr (&Sgetenv_internal); |
1595 defsubr (&Scall_process_region); | 1595 defsubr (&Scall_process_region); |
1596 } | 1596 } |
1597 |