Mercurial > hg > xemacs-beta
diff src/doc.c @ 814:a634e3b7acc8
[xemacs-hg @ 2002-04-14 12:41:59 by ben]
latest changes
TODO.ben-mule-21-5: Update.
make-docfile.c: Add basic support for handling ISO 2022 doc strings -- we parse
the basic charset designation sequences so we know whether we're
in ASCII and have to pay attention to end quotes and such.
Reformat code according to coding standards.
abbrev.el: Add `global-abbrev-mode', which turns on or off abbrev-mode in all
buffers. Added `defining-abbrev-turns-on-abbrev-mode' -- if
non-nil, defining an abbrev through an interactive function will
automatically turn on abbrev-mode, either globally or locally
depending on the command. This is the "what you'd expect"
behavior.
indent.el: general function for indenting a balanced expression in a
mode-correct way. Works similar to indent-region in that a mode
can specify a specific command to do the whole operation; if not,
figure out the region using forward-sexp and indent each line
using indent-according-to-mode.
keydefs.el: Removed.
Modify M-C-backslash to do indent-region-or-balanced-expression.
Make S-Tab just insert a TAB char, like it's meant to do.
make-docfile.el: Now that we're using the call-process-in-lisp, we need to load
an extra file win32-native.el because we're running a bare temacs.
menubar-items.el: Totally redo the Cmds menu so that most used commands appear
directly on the menu and less used commands appear in submenus.
The old way may have been very pretty, but rather impractical.
process.el: Under Windows, don't ever use old-call-process-internal, even
in batch mode. We can do processes in batch mode.
subr.el: Someone recoded truncate-string-to-width, saying "the FSF version
is too complicated and does lots of hard-to-understand stuff" but
the resulting recoded version was *totally* wrong! it
misunderstood the basic point of this function, which is work in
*columns* not chars. i dumped ours and copied the version from
FSF 21.1. Also added truncate-string-with-continuation-dots,
since this idiom is used often.
config.inc.samp, xemacs.mak: Separate out debug and optimize flags.
Remove all vestiges of USE_MINIMAL_TAGBITS,
USE_INDEXED_LRECORD_IMPLEMENTATION, and GUNG_HO, since those
ifdefs have long been removed.
Make error-checking support actually work.
Some rearrangement of config.inc.samp to make it more logical.
Remove callproc.c and ntproc.c from xemacs.mak, no longer used.
Make pdump the default.
lisp.h: Add support for strong type-checking of Bytecount, Bytebpos,
Charcount, Charbpos, and others, by making them classes,
overloading the operators to provide integer-like operation and
carefully controlling what operations are allowed. Not currently
enabled in C++ builds because there are still a number of compile
errors, and it won't really work till we merge in my "8-bit-Mule"
workspace, in which I make use of the new types Charxpos,
Bytexpos, Memxpos, representing a "position" either in a buffer or
a string. (This is especially important in the extent code.)
abbrev.c, alloc.c, eval.c, buffer.c, buffer.h, editfns.c, fns.c, text.h: Warning fixes, some of them related to new C++ strict type
checking of Bytecount, Charbpos, etc.
dired.c: Caught an actual error due to strong type checking -- char len
being passed when should be byte len.
alloc.c, backtrace.h, bytecode.c, bytecode.h, eval.c, sysdep.c: Further optimize Ffuncall:
-- process arg list at compiled-function creation time, converting
into an array for extra-quick access at funcall time.
-- rewrite funcall_compiled_function to use it, and inline this
function.
-- change the order of check for magic stuff in
SPECBIND_FAST_UNSAFE to be faster.
-- move the check for need to garbage collect into the allocation
code, so only a single flag needs to be checked in funcall.
buffer.c, symbols.c: add debug funs to check on mule optimization info in buffers and
strings.
eval.c, emacs.c, text.c, regex.c, scrollbar-msw.c, search.c: Fix evil crashes due to eistrings not properly reinitialized under
pdump. Redo a bit some of the init routines; convert some
complex_vars_of() into simple vars_of(), because they didn't need
complex processing.
callproc.c, emacs.c, event-stream.c, nt.c, process.c, process.h, sysdep.c, sysdep.h, syssignal.h, syswindows.h, ntproc.c: Delete. Hallelujah, praise the Lord, there is no god
but Allah!!!
fix so that processes can be invoked in bare temacs -- thereby
eliminating any need for callproc.c. (currently only eliminated
under NT.) remove all crufty and unnecessary old process code in
ntproc.c and elsewhere. move non-callproc-specific stuff (mostly
environment) into process.c, so callproc.c can be left out under
NT.
console-tty.c, doc.c, file-coding.c, file-coding.h, lstream.c, lstream.h: fix doc string handling so it works with Japanese, etc docs.
change handling of "character mode" so callers don't have to
manually set it (quite error-prone).
event-msw.c: spacing fixes.
lread.c: eliminate unused crufty vintage-19 "FSF defun hack" code.
lrecord.h: improve pdump description docs.
buffer.c, ntheap.c, unexnt.c, win32.c, emacs.c: Mule-ize some unexec and startup code. It was pseudo-Mule-ized
before by simply always calling the ...A versions of functions,
but that won't cut it -- eventually we want to be able to run
properly even if XEmacs has been installed in a Japanese
directory. (The current problem is the timing of the loading of
the Unicode tables; this will eventually be fixed.) Go through and
fix various other places where the code was not Mule-clean.
Provide a function mswindows_get_module_file_name() to get our own
name without resort to PATH_MAX and such. Add a big comment in
main() about the problem with Unicode table load timing that I
just alluded to.
emacs.c: When error-checking is enabled (interpreted as "user is developing
XEmacs"), don't ask user to "pause to read messages" when a fatal
error has occurred, because it will wedge if we are in an inner
modal loop (typically when a menu is popped up) and make us unable
to get a useful stack trace in the debugger.
text.c: Correct update_entirely_ascii_p_flag to actually work.
lisp.h, symsinit.h: declarations for above changes.
author | ben |
---|---|
date | Sun, 14 Apr 2002 12:43:31 +0000 |
parents | e38acbeb1cae |
children | 6728e641994e |
line wrap: on
line diff
--- a/src/doc.c Sat Apr 13 20:44:53 2002 +0000 +++ b/src/doc.c Sun Apr 14 12:43:31 2002 +0000 @@ -22,30 +22,32 @@ /* Synched up with: FSF 19.30. */ -/* This file has been Mule-ized except as noted. */ +/* This file has been Mule-ized. */ #include <config.h> #include "lisp.h" #include "buffer.h" #include "bytecode.h" +#include "file-coding.h" #include "insdel.h" #include "keymap.h" +#include "lstream.h" #include "sysfile.h" Lisp_Object Vinternal_doc_file_name; Lisp_Object QSsubstitute; -/* Read and return doc string from open file descriptor FD - at position POSITION. Does not close the file. Returns - string; or if error, returns a cons holding the error - data to pass to Fsignal. NAME_NONRELOC and NAME_RELOC - are only used for the error messages. */ +/* Read and return doc string or instructions from open file descriptor FD + at position POSITION. Does not close the file. Returns string; or if + error, returns a cons holding the error data to pass to Fsignal. + NAME_NONRELOC and NAME_RELOC are only used for the error messages. */ Lisp_Object unparesseuxify_doc_string (int fd, EMACS_INT position, - Intbyte *name_nonreloc, Lisp_Object name_reloc) + Intbyte *name_nonreloc, Lisp_Object name_reloc, + int standard_doc_file) { Intbyte buf[512 * 32 + 1]; Intbyte *buffer = buf; @@ -53,6 +55,10 @@ Intbyte *from, *to; REGISTER Intbyte *p = buffer; Lisp_Object return_me; + Lisp_Object fdstream = Qnil, instream = Qnil; + struct gcpro gcpro1, gcpro2; + + GCPRO2 (fdstream, instream); if (0 > lseek (fd, position, 0)) { @@ -64,6 +70,21 @@ goto done; } + fdstream = make_filedesc_input_stream (fd, 0, -1, 0); + Lstream_set_buffering (XLSTREAM (fdstream), LSTREAM_UNBUFFERED, 0); + instream = + make_coding_input_stream + /* Major trouble if we are too clever when reading byte-code + instructions! + + #### We should have a way of handling escape-quoted elc files + (i.e. files with non-ASCII/Latin-1 chars in them). Currently this + is "solved" in bytecomp.el by never inserting lazy references in + such files. */ + (XLSTREAM (fdstream), standard_doc_file ? Qundecided : Qbinary, + CODING_DECODE, 0); + Lstream_set_buffering (XLSTREAM (instream), LSTREAM_UNBUFFERED, 0); + /* Read the doc string into a buffer. Use the fixed buffer BUF if it is big enough; otherwise allocate one. We store the buffer in use in BUFFER and its size in BUFFER_SIZE. */ @@ -91,7 +112,7 @@ /* Don't read too much at one go. */ if (space_left > 1024 * 8) space_left = 1024 * 8; - nread = retry_read (fd, p, space_left); + nread = Lstream_read (XLSTREAM (instream), p, space_left); if (nread < 0) { return_me = list1 (build_msg_string @@ -102,13 +123,13 @@ if (!nread) break; { - Intbyte *p1 = qxestrchr (p, '\037'); /* End of doc string marker */ - if (p1) - { - *p1 = 0; - p = p1; - break; - } + Intbyte *p1 = qxestrchr (p, '\037'); /* End of doc string marker */ + if (p1) + { + *p1 = 0; + p = p1; + break; + } } p += nread; } @@ -139,10 +160,15 @@ } } - /* !!#### mrb: following STILL completely broken */ - return_me = make_ext_string ((Extbyte *) buffer, to - buffer, Qbinary); + return_me = make_string (buffer, to - buffer); done: + if (!NILP (instream)) + { + Lstream_delete (XLSTREAM (instream)); + Lstream_delete (XLSTREAM (fdstream)); + } + UNGCPRO; if (buffer != buf) /* We must have allocated buffer above */ xfree (buffer); return return_me; @@ -172,10 +198,12 @@ EMACS_INT position; Lisp_Object file, tem; Lisp_Object name_reloc = Qnil; + int standard_doc_file = 0; if (INTP (filepos)) { file = Vinternal_doc_file_name; + standard_doc_file = 1; position = XINT (filepos); } else if (CONSP (filepos) && INTP (XCDR (filepos))) @@ -232,12 +260,13 @@ #endif /* CANNOT_DUMP */ if (fd < 0) - signal_error (Qfile_error, "Cannot open doc string file", - name_nonreloc ? build_intstring (name_nonreloc) : - name_reloc); + report_file_error ("Cannot open doc string file", + name_nonreloc ? build_intstring (name_nonreloc) : + name_reloc); } - tem = unparesseuxify_doc_string (fd, position, name_nonreloc, name_reloc); + tem = unparesseuxify_doc_string (fd, position, name_nonreloc, name_reloc, + standard_doc_file); retry_close (fd); if (!STRINGP (tem)) @@ -401,7 +430,6 @@ weirdness, type, XSTRING_DATA (XSYMBOL (sym)->name), pos); } - DEFUN ("Snarf-documentation", Fsnarf_documentation, 1, 1, 0, /* Used during Emacs initialization, before dumping runnable Emacs, to find pointers to doc strings stored in `.../lib-src/DOC' and @@ -420,6 +448,14 @@ Lisp_Object sym, fun, tem; Intbyte *name; + /* This function should not pass the data it's reading through a coding + stream. The reason is that the only purpose of this function is to + find the file offsets for the documentation of the various functions, + not do anything with the documentation itself. If we pass through a + coding stream, the pointers will get messed up when we start reading + ISO 2022 data because our pointers will reflect internal format, not + external format. */ + #ifndef CANNOT_DUMP if (!purify_flag) invalid_operation ("Snarf-documentation can only be called in an undumped Emacs", Qunbound); @@ -650,7 +686,6 @@ return Qnil; } - #if 1 /* Don't warn about functions whose doc was lost because they were wrapped by advice-freeze.el... */ static int