comparison src/doc.c @ 563:183866b06e0b

[xemacs-hg @ 2001-05-24 07:50:48 by ben] Makefile.in.in, abbrev.c, alloc.c, buffer.c, bytecode.c, callint.c, callproc.c, casetab.c, chartab.c, cmdloop.c, cmds.c, console-msw.c, console-msw.h, console-stream.c, console-tty.c, console-x.c, console.c, data.c, database.c, debug.c, device-gtk.c, device-msw.c, device-tty.c, device-x.c, device.c, dialog-gtk.c, dialog-msw.c, dialog-x.c, dialog.c, dired-msw.c, dired.c, doc.c, doprnt.c, dragdrop.c, editfns.c, eldap.c, eldap.h, elhash.c, emacs-widget-accessors.c, emacs.c, emodules.c, esd.c, eval.c, event-Xt.c, event-gtk.c, event-msw.c, event-stream.c, events.c, extents.c, faces.c, file-coding.c, fileio.c, filelock.c, floatfns.c, fns.c, font-lock.c, frame-gtk.c, frame-x.c, frame.c, general-slots.h, glade.c, glyphs-gtk.c, glyphs-msw.c, glyphs-widget.c, glyphs-x.c, glyphs.c, glyphs.h, gpmevent.c, gui-gtk.c, gui-x.c, gui.c, gutter.c, hpplay.c, indent.c, input-method-xlib.c, insdel.c, intl.c, keymap.c, libsst.c, libsst.h, linuxplay.c, lisp.h, lread.c, lstream.c, lstream.h, macros.c, marker.c, md5.c, menubar-gtk.c, menubar-msw.c, menubar-x.c, menubar.c, minibuf.c, miscplay.c, miscplay.h, mule-ccl.c, mule-charset.c, mule-wnnfns.c, mule.c, nas.c, ntplay.c, ntproc.c, objects-gtk.c, objects-msw.c, objects-x.c, objects.c, postgresql.c, print.c, process-nt.c, process-unix.c, process.c, ralloc.c, rangetab.c, redisplay.c, scrollbar.c, search.c, select-gtk.c, select-x.c, select.c, sgiplay.c, sheap.c, sound.c, specifier.c, sunplay.c, symbols.c, symeval.h, symsinit.h, syntax.c, sysdep.c, toolbar-msw.c, toolbar.c, tooltalk.c, ui-byhand.c, ui-gtk.c, undo.c, unexaix.c, unexapollo.c, unexconvex.c, unexec.c, widget.c, win32.c, window.c: -- defsymbol -> DEFSYMBOL. -- add an error type to all errors. -- eliminate the error functions in eval.c that let you just use Qerror as the type. -- redo the error API to be more consistent, sensibly named, and easier to use. -- redo the error hierarchy somewhat. create new errors: structure-formation-error, gui-error, invalid-constant, stack-overflow, out-of-memory, process-error, network-error, sound-error, printing-unreadable-object, base64-conversion- error; coding-system-error renamed to text-conversion error; some others. -- fix Mule problems in error strings in emodules.c, tooltalk.c. -- fix error handling in mswin open-network-stream. -- Mule-ize all sound files and clean up the headers. -- nativesound.h -> sound.h and used for all sound files. -- move some shared stuff into glyphs-shared.c: first attempt at eliminating some of the massive GTK code duplication. xemacs.mak: add glyphs-shared.c. xemacs-faq.texi: document how to debug X errors subr.el: fix doc string to reflect reality
author ben
date Thu, 24 May 2001 07:51:33 +0000
parents 1ccc32a20af4
children b39c14581166
comparison
equal deleted inserted replaced
562:c775bd016b32 563:183866b06e0b
229 fd = open (name_nonreloc, O_RDONLY | OPEN_BINARY, 0); 229 fd = open (name_nonreloc, O_RDONLY | OPEN_BINARY, 0);
230 } 230 }
231 #endif /* CANNOT_DUMP */ 231 #endif /* CANNOT_DUMP */
232 232
233 if (fd < 0) 233 if (fd < 0)
234 error ("Cannot open doc string file \"%s\"", 234 signal_error (Qfile_error, "Cannot open doc string file",
235 name_nonreloc ? name_nonreloc : 235 name_nonreloc ? build_string (name_nonreloc) :
236 (char *) XSTRING_DATA (name_reloc)); 236 name_reloc);
237 } 237 }
238 238
239 tem = unparesseuxify_doc_string (fd, position, name_nonreloc, name_reloc); 239 tem = unparesseuxify_doc_string (fd, position, name_nonreloc, name_reloc);
240 close (fd); 240 close (fd);
241 241
242 if (!STRINGP (tem)) 242 if (!STRINGP (tem))
243 signal_error (Qerror, tem); 243 signal_error_1 (Qinvalid_byte_code, tem);
244 244
245 return tem; 245 return tem;
246 } 246 }
247 247
248 /* Get a string from position FILEPOS and pass it through the Lisp reader. 248 /* Get a string from position FILEPOS and pass it through the Lisp reader.
253 read_doc_string (Lisp_Object filepos) 253 read_doc_string (Lisp_Object filepos)
254 { 254 {
255 Lisp_Object string = get_doc_string (filepos); 255 Lisp_Object string = get_doc_string (filepos);
256 256
257 if (!STRINGP (string)) 257 if (!STRINGP (string))
258 signal_simple_error ("loading bytecode failed to return string", string); 258 invalid_state ("loading bytecode failed to return string", string);
259 return Fread (string); 259 return Fread (string);
260 } 260 }
261 261
262 DEFUN ("documentation", Fdocumentation, 1, 2, 0, /* 262 DEFUN ("documentation", Fdocumentation, 1, 2, 0, /*
263 Return the documentation string of FUNCTION. 263 Return the documentation string of FUNCTION.
419 Lisp_Object sym, fun, tem; 419 Lisp_Object sym, fun, tem;
420 char *name; 420 char *name;
421 421
422 #ifndef CANNOT_DUMP 422 #ifndef CANNOT_DUMP
423 if (!purify_flag) 423 if (!purify_flag)
424 error ("Snarf-documentation can only be called in an undumped Emacs"); 424 invalid_operation ("Snarf-documentation can only be called in an undumped Emacs", Qunbound);
425 #endif 425 #endif
426 426
427 CHECK_STRING (filename); 427 CHECK_STRING (filename);
428 428
429 #ifdef CANNOT_DUMP 429 #ifdef CANNOT_DUMP
444 444
445 strcat (name, (char *) XSTRING_DATA (filename)); 445 strcat (name, (char *) XSTRING_DATA (filename));
446 446
447 fd = open (name, O_RDONLY | OPEN_BINARY, 0); 447 fd = open (name, O_RDONLY | OPEN_BINARY, 0);
448 if (fd < 0) 448 if (fd < 0)
449 report_file_error ("Opening doc string file", 449 report_file_error ("Opening doc string file", build_string (name));
450 Fcons (build_string (name), Qnil));
451 Vinternal_doc_file_name = filename; 450 Vinternal_doc_file_name = filename;
452 filled = 0; 451 filled = 0;
453 pos = 0; 452 pos = 0;
454 while (1) 453 while (1)
455 { 454 {
615 } 614 }
616 } 615 }
617 else 616 else
618 { 617 {
619 /* lose: */ 618 /* lose: */
620 error ("DOC file invalid at position %d", pos); 619 signal_error (Qfile_error, "DOC file invalid at position", make_int (pos));
621 weird: 620 weird:
622 /* goto lose */; 621 /* goto lose */;
623 } 622 }
624 } 623 }
625 } 624 }