comparison src/minibuf.c @ 826:6728e641994e

[xemacs-hg @ 2002-05-05 11:30:15 by ben] syntax cache, 8-bit-format, lots of code cleanup README.packages: Update info about --package-path. i.c: Create an inheritable event and pass it on to XEmacs, so that ^C can be handled properly. Intercept ^C and signal the event. "Stop Build" in VC++ now works. bytecomp-runtime.el: Doc string changes. compat.el: Some attempts to redo this to make it truly useful and fix the "multiple versions interacting with each other" problem. Not yet done. Currently doesn't work. files.el: Use with-obsolete-variable to avoid warnings in new revert-buffer code. xemacs.mak: Split up CFLAGS into a version without flags specifying the C library. The problem seems to be that minitar depends on zlib, which depends specifically on libc.lib, not on any of the other C libraries. Unless you compile with libc.lib, you get errors -- specifically, no _errno in the other libraries, which must make it something other than an int. (#### But this doesn't seem to obtain in XEmacs, which also uses zlib, and can be linked with any of the C libraries. Maybe zlib is used differently and doesn't need errno, or maybe XEmacs provides an int errno; ... I don't understand. Makefile.in.in: Fix so that packages are around when testing. abbrev.c, alloc.c, buffer.c, buffer.h, bytecode.c, callint.c, casefiddle.c, casetab.c, casetab.h, charset.h, chartab.c, chartab.h, cmds.c, console-msw.h, console-stream.c, console-x.c, console.c, console.h, data.c, device-msw.c, device.c, device.h, dialog-msw.c, dialog-x.c, dired-msw.c, dired.c, doc.c, doprnt.c, dumper.c, editfns.c, elhash.c, emacs.c, eval.c, event-Xt.c, event-gtk.c, event-msw.c, event-stream.c, events.c, events.h, extents.c, extents.h, faces.c, file-coding.c, file-coding.h, fileio.c, fns.c, font-lock.c, frame-gtk.c, frame-msw.c, frame-x.c, frame.c, frame.h, glade.c, glyphs-gtk.c, glyphs-msw.c, glyphs-msw.h, glyphs-x.c, glyphs.c, glyphs.h, gui-msw.c, gui-x.c, gui.h, gutter.h, hash.h, indent.c, insdel.c, intl-win32.c, intl.c, keymap.c, lisp-disunion.h, lisp-union.h, lisp.h, lread.c, lrecord.h, lstream.c, lstream.h, marker.c, menubar-gtk.c, menubar-msw.c, menubar-x.c, menubar.c, minibuf.c, mule-ccl.c, mule-charset.c, mule-coding.c, mule-wnnfns.c, nas.c, objects-msw.c, objects-x.c, opaque.c, postgresql.c, print.c, process-nt.c, process-unix.c, process.c, process.h, profile.c, rangetab.c, redisplay-gtk.c, redisplay-msw.c, redisplay-output.c, redisplay-x.c, redisplay.c, redisplay.h, regex.c, regex.h, scrollbar-msw.c, search.c, select-x.c, specifier.c, specifier.h, symbols.c, symsinit.h, syntax.c, syntax.h, syswindows.h, tests.c, text.c, text.h, tooltalk.c, ui-byhand.c, ui-gtk.c, unicode.c, win32.c, window.c: Another big Ben patch. -- FUNCTIONALITY CHANGES: add partial support for 8-bit-fixed, 16-bit-fixed, and 32-bit-fixed formats. not quite done yet. (in particular, needs functions to actually convert the buffer.) NOTE: lots of changes to regex.c here. also, many new *_fmt() inline funs that take an Internal_Format argument. redo syntax cache code. make the cache per-buffer; keep the cache valid across calls to functions that use it. also keep it valid across insertions/deletions and extent changes, as much as is possible. eliminate the junky regex-reentrancy code by passing in the relevant lisp info to the regex routines as local vars. add general mechanism in extents code for signalling extent changes. fix numerous problems with the case-table implementation; yoshiki never properly transferred many algorithms from old-style to new-style case tables. redo char tables to support a default argument, so that mapping only occurs over changed args. change many chartab functions to accept Lisp_Object instead of Lisp_Char_Table *. comment out the code in font-lock.c by default, because font-lock.el no longer uses it. we should consider eliminating it entirely. Don't output bell as ^G in console-stream when not a TTY. add -mswindows-termination-handle to interface with i.c, so we can properly kill a build. add more error-checking to buffer/string macros. add some additional buffer_or_string_() funs. -- INTERFACE CHANGES AFFECTING MORE CODE: switch the arguments of write_c_string and friends to be consistent with write_fmt_string, which must have printcharfun first. change BI_* macros to BYTE_* for increased clarity; similarly for bi_* local vars. change VOID_TO_LISP to be a one-argument function. eliminate no-longer-needed CVOID_TO_LISP. -- char/string macro changes: rename MAKE_CHAR() to make_emchar() for slightly less confusion with make_char(). (The former generates an Emchar, the latter a Lisp object. Conceivably we should rename make_char() -> wrap_char() and similarly for make_int(), make_float().) Similar changes for other *CHAR* macros -- we now consistently use names with `emchar' whenever we are working with Emchars. Any remaining name with just `char' always refers to a Lisp object. rename macros with XSTRING_* to string_* except for those that reference actual fields in the Lisp_String object, following conventions used elsewhere. rename set_string_{data,length} macros (the only ones to work with a Lisp_String_* instead of a Lisp_Object) to set_lispstringp_* to make the difference clear. try to be consistent about caps vs. lowercase in macro/inline-fun names for chars and such, which wasn't the case before. we now reserve caps either for XFOO_ macros that reference object fields (e.g. XSTRING_DATA) or for things that have non-function semantics, e.g. directly modifying an arg (BREAKUP_EMCHAR) or evaluating an arg (any arg) more than once. otherwise, use lowercase. here is a summary of most of the macros/inline funs changed by all of the above changes: BYTE_*_P -> byte_*_p XSTRING_BYTE -> string_byte set_string_data/length -> set_lispstringp_data/length XSTRING_CHAR_LENGTH -> string_char_length XSTRING_CHAR -> string_emchar INTBYTE_FIRST_BYTE_P -> intbyte_first_byte_p INTBYTE_LEADING_BYTE_P -> intbyte_leading_byte_p charptr_copy_char -> charptr_copy_emchar LEADING_BYTE_* -> leading_byte_* CHAR_* -> EMCHAR_* *_CHAR_* -> *_EMCHAR_* *_CHAR -> *_EMCHAR CHARSET_BY_ -> charset_by_* BYTE_SHIFT_JIS* -> byte_shift_jis* BYTE_BIG5* -> byte_big5* REP_BYTES_BY_FIRST_BYTE -> rep_bytes_by_first_byte char_to_unicode -> emchar_to_unicode valid_char_p -> valid_emchar_p Change intbyte_strcmp -> qxestrcmp_c (duplicated functionality). -- INTERFACE CHANGES AFFECTING LESS CODE: use DECLARE_INLINE_HEADER in various places. remove '#ifdef emacs' from XEmacs-only files. eliminate CHAR_TABLE_VALUE(), which duplicated the functionality of get_char_table(). add BUFFER_TEXT_LOOP to simplify iterations over buffer text. define typedefs for signed and unsigned types of fixed sizes (INT_32_BIT, UINT_32_BIT, etc.). create ALIGN_FOR_TYPE as a higher-level interface onto ALIGN_SIZE; fix code to use it. add charptr_emchar_len to return the text length of the character pointed to by a ptr; use it in place of charcount_to_bytecount(..., 1). add emchar_len to return the text length of a given character. add types Bytexpos and Charxpos to generalize Bytebpos/Bytecount and Charbpos/Charcount, in code (particularly, the extents code and redisplay code) that works with either kind of index. rename redisplay struct params with names such as `charbpos' to e.g. `charpos' when they are e.g. a Charxpos, not a Charbpos. eliminate xxDEFUN in place of DEFUN; no longer necessary with changes awhile back to doc.c. split up big ugly combined list of EXFUNs in lisp.h on a file-by-file basis, since other prototypes are similarly split. rewrite some "*_UNSAFE" macros as inline funs and eliminate the _UNSAFE suffix. move most string code from lisp.h to text.h; the string code and text.h code is now intertwined in such a fashion that they need to be in the same place and partially interleaved. (you can't create forward references for inline funs) automated/lisp-tests.el, automated/symbol-tests.el, automated/test-harness.el: Fix test harness to output FAIL messages to stderr when in batch mode. Fix up some problems in lisp-tests/symbol-tests that were causing spurious failures.
author ben
date Sun, 05 May 2002 11:33:57 +0000
parents e38acbeb1cae
children 2b6fa2618f76
comparison
equal deleted inserted replaced
825:eb3bc15a6e0f 826:6728e641994e
296 obarray to all of the completion functions, whereas you can't do 296 obarray to all of the completion functions, whereas you can't do
297 anything like that with a hash table. 297 anything like that with a hash table.
298 298
299 To do so, there should probably be a 299 To do so, there should probably be a
300 map_obarray_or_alist_or_hash_table function which would be used by 300 map_obarray_or_alist_or_hash_table function which would be used by
301 both Ftry_completion and Fall_completions. But would the 301 both Ftry_completion and Fall_completions. [[ But would the
302 additional funcalls slow things down? */ 302 additional funcalls slow things down? ]] Seriously doubtful. --ben */
303 303
304 DEFUN ("try-completion", Ftry_completion, 2, 3, 0, /* 304 DEFUN ("try-completion", Ftry_completion, 2, 3, 0, /*
305 Return common substring of all completions of STRING in COLLECTION. 305 Return common substring of all completions of STRING in COLLECTION.
306 COLLECTION must be an alist, an obarray, or a function. 306 COLLECTION must be an alist, an obarray, or a function.
307 Each string in COLLECTION is tested to see if it begins with STRING. 307 Each string in COLLECTION is tested to see if it begins with STRING.
353 else 353 else
354 return call3 (collection, string, predicate, Qnil); 354 return call3 (collection, string, predicate, Qnil);
355 355
356 bestmatch = Qnil; 356 bestmatch = Qnil;
357 blength = 0; 357 blength = 0;
358 slength = XSTRING_CHAR_LENGTH (string); 358 slength = string_char_length (string);
359 359
360 /* If COLLECTION is not a list, set TAIL just for gc pro. */ 360 /* If COLLECTION is not a list, set TAIL just for gc pro. */
361 tail = collection; 361 tail = collection;
362 if (!list) 362 if (!list)
363 { 363 {
416 416
417 /* Is this element a possible completion? */ 417 /* Is this element a possible completion? */
418 418
419 if (STRINGP (eltstring)) 419 if (STRINGP (eltstring))
420 { 420 {
421 Charcount eltlength = XSTRING_CHAR_LENGTH (eltstring); 421 Charcount eltlength = string_char_length (eltstring);
422 if (slength <= eltlength 422 if (slength <= eltlength
423 && (0 > scmp (XSTRING_DATA (eltstring), 423 && (0 > scmp (XSTRING_DATA (eltstring),
424 XSTRING_DATA (string), 424 XSTRING_DATA (string),
425 slength))) 425 slength)))
426 { 426 {
560 list = 1; 560 list = 1;
561 else 561 else
562 return call3 (collection, string, predicate, Qt); 562 return call3 (collection, string, predicate, Qt);
563 563
564 allmatches = Qnil; 564 allmatches = Qnil;
565 slength = XSTRING_CHAR_LENGTH (string); 565 slength = string_char_length (string);
566 566
567 /* If COLLECTION is not a list, set TAIL just for gc pro. */ 567 /* If COLLECTION is not a list, set TAIL just for gc pro. */
568 tail = collection; 568 tail = collection;
569 if (!list) 569 if (!list)
570 { 570 {
616 } 616 }
617 617
618 /* Is this element a possible completion? */ 618 /* Is this element a possible completion? */
619 619
620 if (STRINGP (eltstring) 620 if (STRINGP (eltstring)
621 && (slength <= XSTRING_CHAR_LENGTH (eltstring)) 621 && (slength <= string_char_length (eltstring))
622 /* Reject alternatives that start with space 622 /* Reject alternatives that start with space
623 unless the input starts with space. */ 623 unless the input starts with space. */
624 && ((XSTRING_CHAR_LENGTH (string) > 0 && 624 && ((string_char_length (string) > 0 &&
625 XSTRING_CHAR (string, 0) == ' ') 625 string_emchar (string, 0) == ' ')
626 || XSTRING_CHAR (eltstring, 0) != ' ') 626 || string_emchar (eltstring, 0) != ' ')
627 && (0 > scmp (XSTRING_DATA (eltstring), 627 && (0 > scmp (XSTRING_DATA (eltstring),
628 XSTRING_DATA (string), 628 XSTRING_DATA (string),
629 slength))) 629 slength)))
630 { 630 {
631 /* Yes. Now check whether predicate likes it. */ 631 /* Yes. Now check whether predicate likes it. */
647 /* More than useless. I've nuked minibuf_prompt_width so they won't 647 /* More than useless. I've nuked minibuf_prompt_width so they won't
648 function at all in XEmacs at the moment. They are used to 648 function at all in XEmacs at the moment. They are used to
649 implement some braindamage in FSF which we aren't including. --cet */ 649 implement some braindamage in FSF which we aren't including. --cet */
650 650
651 #if 0 651 #if 0
652 xxDEFUN ("minibuffer-prompt", Fminibuffer_prompt, 0, 0, 0, /* 652 DEFUN ("minibuffer-prompt", Fminibuffer_prompt, 0, 0, 0, /*
653 Return the prompt string of the currently-active minibuffer. 653 Return the prompt string of the currently-active minibuffer.
654 If no minibuffer is active, return nil. 654 If no minibuffer is active, return nil.
655 */ 655 */
656 ()) 656 ())
657 { 657 {
658 return Fcopy_sequence (Vminibuf_prompt); 658 return Fcopy_sequence (Vminibuf_prompt);
659 } 659 }
660 660
661 xxDEFUN ("minibuffer-prompt-width", Fminibuffer_prompt_width, 0, 0, 0, /* 661 DEFUN ("minibuffer-prompt-width", Fminibuffer_prompt_width, 0, 0, 0, /*
662 Return the display width of the minibuffer prompt. 662 Return the display width of the minibuffer prompt.
663 */ 663 */
664 ()) 664 ())
665 { 665 {
666 return make_int (minibuf_prompt_width); 666 return make_int (minibuf_prompt_width);
754 } 754 }
755 else 755 else
756 { 756 {
757 if (STRINGP (reloc)) 757 if (STRINGP (reloc))
758 nonreloc = XSTRING_DATA (reloc); 758 nonreloc = XSTRING_DATA (reloc);
759 write_string_1 (nonreloc + offset, length, Qexternal_debugging_output); 759 write_string_1 (Qexternal_debugging_output, nonreloc + offset, length);
760 } 760 }
761 } 761 }
762 762
763 void 763 void
764 echo_area_message (struct frame *f, const Intbyte *nonreloc, 764 echo_area_message (struct frame *f, const Intbyte *nonreloc,