comparison src/doc.c @ 239:41f2f0e326e9 r20-5b18

Import from CVS: tag r20-5b18
author cvs
date Mon, 13 Aug 2007 10:15:48 +0200
parents 0e522484dd2a
children 677f6a0ee643
comparison
equal deleted inserted replaced
238:b5f2e56b938d 239:41f2f0e326e9
426 error ("Snarf-documentation can only be called in an undumped Emacs"); 426 error ("Snarf-documentation can only be called in an undumped Emacs");
427 #endif 427 #endif
428 428
429 CHECK_STRING (filename); 429 CHECK_STRING (filename);
430 430
431 #ifndef CANNOT_DUMP 431 #ifdef CANNOT_DUMP
432 name = (char *) alloca (XSTRING_LENGTH (filename) + 14); 432 if (!NILP(Vdoc_directory))
433 strcpy (name, "../lib-src/"); 433 {
434 #else /* CANNOT_DUMP */ 434 CHECK_STRING (Vdoc_directory);
435 CHECK_STRING (Vdoc_directory); 435 name = (char *) alloca (XSTRING_LENGTH (filename)
436 name = (char *) alloca (XSTRING_LENGTH (filename) 436 + XSTRING_LENGTH (Vdoc_directory)
437 + XSTRING_LENGTH (Vdoc_directory) 437 + 1);
438 + 1); 438 strcpy (name, (char *) XSTRING_DATA (Vdoc_directory));
439 strcpy (name, (char *) XSTRING_DATA (Vdoc_directory)); 439 }
440 else
440 #endif /* CANNOT_DUMP */ 441 #endif /* CANNOT_DUMP */
442 {
443 name = (char *) alloca (XSTRING_LENGTH (filename) + 14);
444 strcpy (name, "../lib-src/");
445 }
446
441 strcat (name, (char *) XSTRING_DATA (filename)); 447 strcat (name, (char *) XSTRING_DATA (filename));
442 448
443 fd = open (name, O_RDONLY, 0); 449 fd = open (name, O_RDONLY, 0);
444 if (fd < 0) 450 if (fd < 0)
445 report_file_error ("Opening doc string file", 451 report_file_error ("Opening doc string file",