Mercurial > hg > xemacs-beta

comparison src/buffer.h @ 800:a5954632b187

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[xemacs-hg @ 2002-03-31 08:27:14 by ben] more fixes, first crack at finishing behavior implementation TODO.ben-mule-21-5: Update. configure.in: Fix for new error-checking types. make-mswin-unicode.pl: Don't be fucked up by CRLF. Output code to force errors when nonintercepted Windows calls issued. behavior.el, dumped-lisp.el, menubar-items.el: Add support for saving using custom. Load into a dumped XEmacs. Correct :title to :short-doc in accordance with behavior-defs.el. Add a submenu under Options for turning on/off behaviors. cl-macs.el: Properly document `loop'. Fix a minor bug in keymap iteration and add support for bit-vector iteration. lisp-mode.el: Rearrange and add items for macro expanding. menubar-items.el: Document connection between these two functions. window.el: Port stuff from GNU 21.1. config.inc.samp, xemacs.mak: Separate out and add new variable for controlling error-checking. s/windowsnt.h: Use new ERROR_CHECK_ALL; not related to DEBUG_XEMACS. alloc.c, backtrace.h, buffer.c, buffer.h, bytecode.c, callproc.c, casetab.c, charset.h, chartab.c, cmdloop.c, config.h.in, console-msw.c, console-stream.c, console-tty.c, console.c, console.h, data.c, device-msw.c, device.c, device.h, dired-msw.c, dired.c, dumper.c, editfns.c, eldap.c, elhash.c, emacs.c, eval.c, event-Xt.c, event-gtk.c, event-msw.c, event-stream.c, events.c, extents.c, faces.c, file-coding.c, file-coding.h, fileio.c, frame-msw.c, frame.c, frame.h, glyphs-gtk.c, glyphs-msw.c, glyphs-shared.c, glyphs-widget.c, glyphs-x.c, glyphs.c, glyphs.h, insdel.c, intl-auto-encap-win32.c, intl-auto-encap-win32.h, intl-encap-win32.c, intl-win32.c, keymap.c, lisp-union.h, lisp.h, lread.c, lrecord.h, lstream.c, lstream.h, macros.c, marker.c, md5.c, menubar-x.c, menubar.c, mule-coding.c, ntproc.c, objects-gtk.c, objects-msw.c, objects-x.c, objects.c, opaque.c, print.c, process-nt.c, process-unix.c, process.c, rangetab.c, redisplay-msw.c, redisplay-output.c, redisplay.c, regex.c, scrollbar-msw.c, select-msw.c, signal.c, specifier.c, specifier.h, symbols.c, sysdep.c, syswindows.h, text.c, text.h, toolbar-msw.c, tooltalk.c, ui-gtk.c, unicode.c, window.c: Redo error-checking macros: ERROR_CHECK_TYPECHECK -> ERROR_CHECK_TYPES, ERROR_CHECK_CHARBPOS -> ERROR_CHECK_TEXT, add ERROR_CHECK_DISPLAY, ERROR_CHECK_STRUCTURES. Document these in config.h.in. Fix code to follow docs. Fix *_checking_assert() in accordance with new names. Attempt to fix periodic redisplay crash freeing display line structures. Add first implementation of sledgehammer redisplay check. Redo print_*() to use write_fmt_string(), write_fmt_string_lisp(). Fix bug in md5 handling. Rename character-to-unicode to char-to-unicode; same for unicode-to-char{acter}. Move chartab documentation to `make-char-table'. Some header cleanup. Clean up remaining places where nonintercepted Windows calls are being used. automated/mule-tests.el: Fix for new Unicode support.
author ben
date Sun, 31 Mar 2002 08:30:17 +0000
parents e38acbeb1cae
children a634e3b7acc8
comparison
equal deleted inserted replaced
799:03d9f9084848 800:a5954632b187
357 357
358 INLINE_HEADER Bytebpos membpos_to_bytebpos (struct buffer *buf, Membpos x); 358 INLINE_HEADER Bytebpos membpos_to_bytebpos (struct buffer *buf, Membpos x);
359 INLINE_HEADER Bytebpos 359 INLINE_HEADER Bytebpos
360 membpos_to_bytebpos (struct buffer *buf, Membpos x) 360 membpos_to_bytebpos (struct buffer *buf, Membpos x)
361 { 361 {
362 #ifdef ERROR_CHECK_CHARBPOS 362 #ifdef ERROR_CHECK_TEXT
363 assert (valid_membpos_p (buf, x)); 363 assert (valid_membpos_p (buf, x));
364 #endif 364 #endif
365 return (Bytebpos) ((x > (Membpos) buf->text->gpt) ? 365 return (Bytebpos) ((x > (Membpos) buf->text->gpt) ?
366 x - buf->text->gap_size : 366 x - buf->text->gap_size :
367 x); 367 x);
491 INTBYTE_FIRST_BYTE_P (*BI_BUF_BYTE_ADDRESS (buf, x)) 491 INTBYTE_FIRST_BYTE_P (*BI_BUF_BYTE_ADDRESS (buf, x))
492 #else 492 #else
493 # define VALID_BYTEBPOS_P(buf, x) 1 493 # define VALID_BYTEBPOS_P(buf, x) 1
494 #endif 494 #endif
495 495
496 #ifdef ERROR_CHECK_CHARBPOS 496 #ifdef ERROR_CHECK_TEXT
497 497
498 # define ASSERT_VALID_BYTEBPOS_UNSAFE(buf, x) do { \ 498 # define ASSERT_VALID_BYTEBPOS_UNSAFE(buf, x) do { \
499 assert (BUFFER_LIVE_P (buf)); \ 499 assert (BUFFER_LIVE_P (buf)); \
500 assert ((x) >= BI_BUF_BEG (buf) && x <= BI_BUF_Z (buf)); \ 500 assert ((x) >= BI_BUF_BEG (buf) && x <= BI_BUF_Z (buf)); \
501 assert (VALID_BYTEBPOS_P (buf, x)); \ 501 assert (VALID_BYTEBPOS_P (buf, x)); \
509 assert (BUFFER_LIVE_P (buf)); \ 509 assert (BUFFER_LIVE_P (buf)); \
510 assert ((x) >= BI_BUF_BEG (buf) && x < BI_BUF_Z (buf)); \ 510 assert ((x) >= BI_BUF_BEG (buf) && x < BI_BUF_Z (buf)); \
511 assert (VALID_BYTEBPOS_P (buf, x)); \ 511 assert (VALID_BYTEBPOS_P (buf, x)); \
512 } while (0) 512 } while (0)
513 513
514 #else /* not ERROR_CHECK_CHARBPOS */ 514 #else /* not ERROR_CHECK_TEXT */
515 # define ASSERT_VALID_BYTEBPOS_UNSAFE(buf, x) 515 # define ASSERT_VALID_BYTEBPOS_UNSAFE(buf, x)
516 # define ASSERT_VALID_BYTEBPOS_BACKWARD_UNSAFE(buf, x) 516 # define ASSERT_VALID_BYTEBPOS_BACKWARD_UNSAFE(buf, x)
517 # define ASSERT_VALID_BYTEBPOS_FORWARD_UNSAFE(buf, x) 517 # define ASSERT_VALID_BYTEBPOS_FORWARD_UNSAFE(buf, x)
518 518
519 #endif /* not ERROR_CHECK_CHARBPOS */ 519 #endif /* not ERROR_CHECK_TEXT */
520 520
521 /* Note that, although the Mule version will work fine for non-Mule 521 /* Note that, although the Mule version will work fine for non-Mule
522 as well (it should reduce down to nothing), we provide a separate 522 as well (it should reduce down to nothing), we provide a separate
523 version to avoid compilation warnings and possible non-optimal 523 version to avoid compilation warnings and possible non-optimal
524 results with stupid compilers. */ 524 results with stupid compilers. */
546 } while (0) 546 } while (0)
547 #else 547 #else
548 # define VALIDATE_BYTEBPOS_FORWARD(buf, x) 548 # define VALIDATE_BYTEBPOS_FORWARD(buf, x)
549 #endif 549 #endif
550 550
551 /* Note that in the simplest case (no MULE, no ERROR_CHECK_CHARBPOS), 551 /* Note that in the simplest case (no MULE, no ERROR_CHECK_TEXT),
552 this crap reduces down to simply (x)++. */ 552 this crap reduces down to simply (x)++. */
553 553
554 #define INC_BYTEBPOS(buf, x) do \ 554 #define INC_BYTEBPOS(buf, x) do \
555 { \ 555 { \
556 ASSERT_VALID_BYTEBPOS_FORWARD_UNSAFE (buf, x); \ 556 ASSERT_VALID_BYTEBPOS_FORWARD_UNSAFE (buf, x); \
560 the correct side of the gap */ \ 560 the correct side of the gap */ \
561 (x)++; \ 561 (x)++; \
562 VALIDATE_BYTEBPOS_FORWARD (buf, x); \ 562 VALIDATE_BYTEBPOS_FORWARD (buf, x); \
563 } while (0) 563 } while (0)
564 564
565 /* Note that in the simplest case (no MULE, no ERROR_CHECK_CHARBPOS), 565 /* Note that in the simplest case (no MULE, no ERROR_CHECK_TEXT),
566 this crap reduces down to simply (x)--. */ 566 this crap reduces down to simply (x)--. */
567 567
568 #define DEC_BYTEBPOS(buf, x) do \ 568 #define DEC_BYTEBPOS(buf, x) do \
569 { \ 569 { \
570 ASSERT_VALID_BYTEBPOS_BACKWARD_UNSAFE (buf, x); \ 570 ASSERT_VALID_BYTEBPOS_BACKWARD_UNSAFE (buf, x); \
701 # define real_charbpos_to_bytebpos(buf, x) ((Bytebpos) x) 701 # define real_charbpos_to_bytebpos(buf, x) ((Bytebpos) x)
702 # define real_bytebpos_to_charbpos(buf, x) ((Charbpos) x) 702 # define real_bytebpos_to_charbpos(buf, x) ((Charbpos) x)
703 703
704 #endif /* not MULE */ 704 #endif /* not MULE */
705 705
706 #ifdef ERROR_CHECK_CHARBPOS 706 #ifdef ERROR_CHECK_TEXT
707 707
708 Bytebpos charbpos_to_bytebpos (struct buffer *buf, Charbpos x); 708 Bytebpos charbpos_to_bytebpos (struct buffer *buf, Charbpos x);
709 Charbpos bytebpos_to_charbpos (struct buffer *buf, Bytebpos x); 709 Charbpos bytebpos_to_charbpos (struct buffer *buf, Bytebpos x);
710 710
711 #else /* not ERROR_CHECK_CHARBPOS */ 711 #else /* not ERROR_CHECK_TEXT */
712 712
713 #define charbpos_to_bytebpos real_charbpos_to_bytebpos 713 #define charbpos_to_bytebpos real_charbpos_to_bytebpos
714 #define bytebpos_to_charbpos real_bytebpos_to_charbpos 714 #define bytebpos_to_charbpos real_bytebpos_to_charbpos
715 715
716 #endif /* not ERROR_CHECK_CHARBPOS */ 716 #endif /* not ERROR_CHECK_TEXT */
717 717
718 #define make_charbpos(buf, ind) make_int (bytebpos_to_charbpos (buf, ind)) 718 #define make_charbpos(buf, ind) make_int (bytebpos_to_charbpos (buf, ind))
719 719
720 /*----------------------------------------------------------------------*/ 720 /*----------------------------------------------------------------------*/
721 /* Converting between buffer bytes and Emacs characters */ 721 /* Converting between buffer bytes and Emacs characters */