comparison src/emacs.c @ 274:ca9a9ec9c1c1 r21-0b35

Import from CVS: tag r21-0b35
author cvs
date Mon, 13 Aug 2007 10:29:42 +0200
parents c5d627a313b1
children 6330739388db
comparison
equal deleted inserted replaced
273:411aac7253ef 274:ca9a9ec9c1c1
1146 lstream_type_create (); 1146 lstream_type_create ();
1147 #ifdef FILE_CODING 1147 #ifdef FILE_CODING
1148 lstream_type_create_mule_coding (); 1148 lstream_type_create_mule_coding ();
1149 #endif 1149 #endif
1150 lstream_type_create_print (); 1150 lstream_type_create_print ();
1151 1151 #ifdef HAVE_MS_WINDOWS
1152 lstream_type_create_mswindows_selectable ();
1153 #endif
1154
1152 /* Initialize processes implementation. 1155 /* Initialize processes implementation.
1153 The functions may make exactly the following function/macro calls: 1156 The functions may make exactly the following function/macro calls:
1154 1157
1155 PROCESS_HAS_METHOD() 1158 PROCESS_HAS_METHOD()
1156 */ 1159 */
1157 #ifdef HAVE_UNIX_PROCESSES 1160 #ifdef HAVE_UNIX_PROCESSES
1158 process_type_create_unix (); 1161 process_type_create_unix ();
1159 #endif 1162 #endif
1160 #ifdef HAVE_WIN32_PROCESSES 1163 #ifdef HAVE_WIN32_PROCESSES
1161 process_type_create_mswindows (); 1164 process_type_create_nt ();
1162 #endif 1165 #endif
1163 1166
1164 /* Now initialize most variables. 1167 /* Now initialize most variables.
1165 1168
1166 These functions may do exactly the following: 1169 These functions may do exactly the following:
1276 vars_of_process (); 1279 vars_of_process ();
1277 #ifdef HAVE_UNIX_PROCESSES 1280 #ifdef HAVE_UNIX_PROCESSES
1278 vars_of_process_unix (); 1281 vars_of_process_unix ();
1279 #endif 1282 #endif
1280 #ifdef HAVE_WIN32_PROCESSES 1283 #ifdef HAVE_WIN32_PROCESSES
1281 vars_of_process_mswindows (); 1284 vars_of_process_nt ();
1282 #endif 1285 #endif
1283 #endif 1286 #endif
1284 1287
1285 vars_of_profile (); 1288 vars_of_profile ();
1286 #if defined (HAVE_MMAP) && defined (REL_ALLOC) && !defined(DOUG_LEA_MALLOC) 1289 #if defined (HAVE_MMAP) && defined (REL_ALLOC) && !defined(DOUG_LEA_MALLOC)
2323 2326
2324 #ifdef FREE_CHECKING 2327 #ifdef FREE_CHECKING
2325 Freally_free (Qnil); 2328 Freally_free (Qnil);
2326 2329
2327 /* When we're dumping, we can't use the debugging free() */ 2330 /* When we're dumping, we can't use the debugging free() */
2328 2331 disable_free_hook ();
2329 #endif 2332 #endif
2330 #if 1 /* martin */ 2333 #if 1 /* martin */
2331 #endif 2334 #endif
2332 2335
2333 CHECK_STRING (intoname); 2336 CHECK_STRING (intoname);
2388 2391
2389 garbage_collect_1 (); 2392 garbage_collect_1 ();
2390 #ifdef DOUG_LEA_MALLOC 2393 #ifdef DOUG_LEA_MALLOC
2391 malloc_state_ptr = malloc_get_state (); 2394 malloc_state_ptr = malloc_get_state ();
2392 #endif 2395 #endif
2393 #ifdef ERROR_CHECK_MALLOC
2394 disable_free_hook ();
2395 #endif
2396 /* here we break our rule that the filename conversion should 2396 /* here we break our rule that the filename conversion should
2397 be performed at the actual time that the system call is made. 2397 be performed at the actual time that the system call is made.
2398 It's a whole lot easier to do the conversion here than to 2398 It's a whole lot easier to do the conversion here than to
2399 modify all the unexec routines to ensure that filename 2399 modify all the unexec routines to ensure that filename
2400 conversion is applied everywhere. Don't worry about memory 2400 conversion is applied everywhere. Don't worry about memory
2448 2448
2449 while (1) 2449 while (1)
2450 { 2450 {
2451 p = strchr (path, SEPCHAR); 2451 p = strchr (path, SEPCHAR);
2452 if (!p) p = path + strlen (path); 2452 if (!p) p = path + strlen (path);
2453 lpath = Fcons (((p != path) 2453 lpath = Fcons (Ffile_name_as_directory(make_string ((CONST Bufbyte *) path,
2454 #if 1 2454 p - path)),
2455 ? Ffile_name_as_directory(make_string ((CONST Bufbyte *) path, p - path))
2456 #else
2457 ? make_string ((CONST Bufbyte *) path, p - path)
2458 #endif
2459 : Qnil),
2460 lpath); 2455 lpath);
2461 if (*p) 2456 if (*p)
2462 path = p + 1; 2457 path = p + 1;
2463 else 2458 else
2464 break; 2459 break;