Mercurial > hg > xemacs-beta

comparison src/insdel.c @ 793:e38acbeb1cae

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[xemacs-hg @ 2002-03-29 04:46:17 by ben] lots o' fixes etc/ChangeLog: New file. Separated out all entries for etc/ into their own ChangeLog. Includes entries for the following files: etc/BABYL, etc/BETA, etc/CHARSETS, etc/DISTRIB, etc/Emacs.ad, etc/FTP, etc/GNUS-NEWS, etc/GOATS, etc/HELLO, etc/INSTALL, etc/MACHINES, etc/MAILINGLISTS, etc/MSDOS, etc/MYTHOLOGY, etc/NEWS, etc/OXYMORONS, etc/PACKAGES, etc/README, etc/TUTORIAL, etc/TUTORIAL.de, etc/TUTORIAL.ja, etc/TUTORIAL.ko, etc/TUTORIAL.se, etc/aliases.ksh, etc/altrasoft-logo.xpm, etc/check_cygwin_setup.sh, etc/custom/example-themes/europe-theme.el, etc/custom/example-themes/ex-custom-file, etc/custom/example-themes/example-theme.el, etc/e/eterm.ti, etc/edt-user.doc, etc/enriched.doc, etc/etags.1, etc/gnuserv.1, etc/gnuserv.README, etc/package-index.LATEST.gpg, etc/package-index.LATEST.pgp, etc/photos/jan.png, etc/recycle.xpm, etc/refcard.tex, etc/sample.Xdefaults, etc/sample.emacs, etc/sgml/CATALOG, etc/sgml/HTML32.dtd, etc/skk/SKK.tut.E, etc/smilies/Face_ase.xbm, etc/smilies/Face_ase2.xbm, etc/smilies/Face_ase3.xbm, etc/smilies/Face_smile.xbm, etc/smilies/Face_weep.xbm, etc/sounds, etc/toolbar, etc/toolbar/workshop-cap-up.xpm, etc/xemacs-ja.1, etc/xemacs.1, etc/yow.lines, etc\BETA, etc\NEWS, etc\README, etc\TUTORIAL, etc\TUTORIAL.de, etc\check_cygwin_setup.sh, etc\sample.init.el, etc\unicode\README, etc\unicode\mule-ucs\*, etc\unicode\other\* unicode/unicode-consortium/8859-16.TXT: New file. mule/english.el: Define this charset now, since a bug was fixed that formerly prevented it. mule/ethio-util.el: Fix compile errors involving Unicode `characters', which should be integers. Makefile.in.in: Always include gui.c, to fix compile error when TTY-only. EmacsFrame.c, abbrev.c, alloc.c, buffer.c, buffer.h, bytecode.c, bytecode.h, callint.c, callproc.c, casetab.c, casetab.h, charset.h, chartab.c, chartab.h, cmds.c, console-msw.c, console-msw.h, console-tty.c, console-x.c, console-x.h, console.c, console.h, data.c, database.c, device-gtk.c, device-msw.c, device-x.c, device.c, device.h, dialog-msw.c, doc.c, doprnt.c, dumper.c, dynarr.c, editfns.c, eldap.c, eldap.h, elhash.c, elhash.h, emacs.c, eval.c, event-Xt.c, event-gtk.c, event-msw.c, event-stream.c, event-tty.c, event-unixoid.c, events.c, events.h, extents.c, extents.h, faces.c, faces.h, file-coding.c, file-coding.h, fileio.c, filelock.c, fns.c, frame-gtk.c, frame-msw.c, frame-tty.c, frame-x.c, frame.c, frame.h, free-hook.c, general-slots.h, glyphs-eimage.c, glyphs-gtk.c, glyphs-msw.c, glyphs-widget.c, glyphs-x.c, glyphs.c, glyphs.h, gpmevent.c, gtk-xemacs.c, gui-msw.c, gui-x.c, gui-x.h, gui.c, gui.h, gutter.c, gutter.h, indent.c, input-method-xlib.c, insdel.c, keymap.c, keymap.h, 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-canna.c, mule-ccl.c, mule-charset.c, mule-wnnfns.c, native-gtk-toolbar.c, objects-msw.c, objects-tty.c, objects-x.c, objects.c, objects.h, opaque.c, opaque.h, postgresql.c, postgresql.h, print.c, process-unix.c, process.c, process.h, rangetab.c, rangetab.h, redisplay-gtk.c, redisplay-msw.c, redisplay-output.c, redisplay-tty.c, redisplay-x.c, redisplay.c, scrollbar-gtk.c, scrollbar-msw.c, scrollbar-x.c, scrollbar.c, scrollbar.h, search.c, select-gtk.c, select-x.c, sound.c, specifier.c, specifier.h, strftime.c, symbols.c, symeval.h, syntax.h, text.c, text.h, toolbar-common.c, toolbar-msw.c, toolbar.c, toolbar.h, tooltalk.c, tooltalk.h, ui-gtk.c, ui-gtk.h, undo.c, vm-limit.c, window.c, window.h: Eliminate XSETFOO. Replace all usages with wrap_foo(). Make symbol->name a Lisp_Object, not Lisp_String *. Eliminate nearly all uses of Lisp_String * in favor of Lisp_Object, and correct macros so most of them favor Lisp_Object. Create new error-behavior ERROR_ME_DEBUG_WARN -- output warnings, but at level `debug' (usually ignored). Use it when instantiating specifiers, so problems can be debugged. Move log-warning-minimum-level into C so that we can optimize ERROR_ME_DEBUG_WARN. Fix warning levels consistent with new definitions. Add default_ and parent fields to char table; not yet implemented. New fun Dynarr_verify(); use for further error checking on Dynarrs. Rearrange code at top of lisp.h in conjunction with dynarr changes. Fix eifree(). Use Eistrings in various places (format_event_object(), where_is_to_char(), and callers thereof) to avoid fixed-size strings buffers. New fun write_eistring(). Reindent and fix GPM code to follow standards. Set default MS Windows font to Lucida Console (same size as Courier New but less interline spacing, so more lines fit). Increase default frame size on Windows to 50 lines. (If that's too big for the workspace, the frame will be shrunk as necessary.) Fix problem with text files with no newlines (). (Change `convert-eol' coding system to use `nil' for autodetect, consistent with make-coding-system.) Correct compile warnings in vm-limit.c. Fix handling of reverse-direction charsets to avoid errors when opening (e.g.) mule-ucs/lisp/reldata/uiso8859-6.el. Recode some object printing methods to use write_fmt_string() instead of a fixed buffer and sprintf. Turn on display of png comments as warnings (level `info'), now that they're unobtrusive. Revamped the sound documentation. Fixed bug in redisplay w.r.t. hscroll/truncation/continuation glyphs causing jumping up and down of the lines, since they're bigger than the line size. (It was seen most obviously when there's a horizontal scroll bar, e.g. do C-h a glyph or something like that.) The problem was that the glyph-contrib-p setting on glyphs was ignored even if it was set properly, which it wasn't until now.
author ben
date Fri, 29 Mar 2002 04:49:13 +0000
parents 943eaba38521
children a5954632b187
comparison
equal deleted inserted replaced
792:4e83fdb13eb9 793:e38acbeb1cae
1 /* Buffer insertion/deletion and gap motion for XEmacs. 1 /* Buffer insertion/deletion and gap motion for XEmacs.
2 Copyright (C) 1985, 1986, 1991, 1992, 1993, 1994, 1995 2 Copyright (C) 1985, 1986, 1991, 1992, 1993, 1994, 1995
3 Free Software Foundation, Inc. 3 Free Software Foundation, Inc.
4 Copyright (C) 1995 Sun Microsystems, Inc. 4 Copyright (C) 1995 Sun Microsystems, Inc.
5 Copyright (C) 2001 Ben Wing. 5 Copyright (C) 2001, 2002 Ben Wing.
6 6
7 This file is part of XEmacs. 7 This file is part of XEmacs.
8 8
9 XEmacs is free software; you can redistribute it and/or modify it 9 XEmacs is free software; you can redistribute it and/or modify it
10 under the terms of the GNU General Public License as published by the 10 under the terms of the GNU General Public License as published by the
665 665
666 buf->text->changes->mc_begin = start; 666 buf->text->changes->mc_begin = start;
667 buf->text->changes->mc_orig_end = buf->text->changes->mc_new_end = end; 667 buf->text->changes->mc_orig_end = buf->text->changes->mc_new_end = end;
668 buf->text->changes->mc_begin_signaled = 0; 668 buf->text->changes->mc_begin_signaled = 0;
669 count = specpdl_depth (); 669 count = specpdl_depth ();
670 XSETBUFFER (buffer, buf); 670 buffer = wrap_buffer (buf);
671 record_unwind_protect (multiple_change_finish_up, buffer); 671 record_unwind_protect (multiple_change_finish_up, buffer);
672 } 672 }
673 buf->text->changes->in_multiple_change++; 673 buf->text->changes->in_multiple_change++;
674 /* We don't call before-change-functions until signal_before_change() 674 /* We don't call before-change-functions until signal_before_change()
675 is called, in case there is a read-only or other error. */ 675 is called, in case there is a read-only or other error. */
712 712
713 static void 713 static void
714 signal_first_change (struct buffer *buf) 714 signal_first_change (struct buffer *buf)
715 { 715 {
716 /* This function can GC */ 716 /* This function can GC */
717 Lisp_Object buffer; 717 Lisp_Object buffer = wrap_buffer (current_buffer);
718 XSETBUFFER (buffer, current_buffer); 718
719 719
720 if (!in_first_change) 720 if (!in_first_change)
721 { 721 {
722 if (!NILP (symbol_value_in_buffer (Qfirst_change_hook, buffer))) 722 if (!NILP (symbol_value_in_buffer (Qfirst_change_hook, buffer)))
723 { 723 {
786 record_unwind_protect (change_function_restore, Fcurrent_buffer ()); 786 record_unwind_protect (change_function_restore, Fcurrent_buffer ());
787 inside_change_hook = 1; 787 inside_change_hook = 1;
788 788
789 MAP_INDIRECT_BUFFERS (buf, mbuf, bufcons) 789 MAP_INDIRECT_BUFFERS (buf, mbuf, bufcons)
790 { 790 {
791 XSETBUFFER (buffer, mbuf); 791 buffer = wrap_buffer (mbuf);
792 if (!NILP (symbol_value_in_buffer (Qbefore_change_functions, buffer)) 792 if (!NILP (symbol_value_in_buffer (Qbefore_change_functions, buffer))
793 /* Obsolete, for compatibility */ 793 /* Obsolete, for compatibility */
794 || !NILP (symbol_value_in_buffer (Qbefore_change_function, buffer))) 794 || !NILP (symbol_value_in_buffer (Qbefore_change_function, buffer)))
795 { 795 {
796 set_buffer_internal (buf); 796 set_buffer_internal (buf);
809 if (end < BUF_BEGV (buf)) end = BUF_BEGV (buf); 809 if (end < BUF_BEGV (buf)) end = BUF_BEGV (buf);
810 if (end > BUF_ZV (buf)) end = BUF_ZV (buf); 810 if (end > BUF_ZV (buf)) end = BUF_ZV (buf);
811 811
812 MAP_INDIRECT_BUFFERS (buf, mbuf, bufcons) 812 MAP_INDIRECT_BUFFERS (buf, mbuf, bufcons)
813 { 813 {
814 XSETBUFFER (buffer, mbuf); 814 buffer = wrap_buffer (mbuf);
815 report_extent_modification (buffer, start, end, 0); 815 report_extent_modification (buffer, start, end, 0);
816 } 816 }
817 unbind_to (speccount); 817 unbind_to (speccount);
818 818
819 /* Only now do we indicate that the before-change-functions have 819 /* Only now do we indicate that the before-change-functions have
867 speccount = specpdl_depth (); 867 speccount = specpdl_depth ();
868 record_unwind_protect (change_function_restore, Fcurrent_buffer ()); 868 record_unwind_protect (change_function_restore, Fcurrent_buffer ());
869 inside_change_hook = 1; 869 inside_change_hook = 1;
870 MAP_INDIRECT_BUFFERS (buf, mbuf, bufcons) 870 MAP_INDIRECT_BUFFERS (buf, mbuf, bufcons)
871 { 871 {
872 XSETBUFFER (buffer, mbuf); 872 buffer = wrap_buffer (mbuf);
873 873
874 if (!NILP (symbol_value_in_buffer (Qafter_change_functions, buffer)) 874 if (!NILP (symbol_value_in_buffer (Qafter_change_functions, buffer))
875 /* Obsolete, for compatibility */ 875 /* Obsolete, for compatibility */
876 || !NILP (symbol_value_in_buffer (Qafter_change_function, buffer))) 876 || !NILP (symbol_value_in_buffer (Qafter_change_function, buffer)))
877 { 877 {
897 if (orig_end < BUF_BEGV (buf)) orig_end = BUF_BEGV (buf); 897 if (orig_end < BUF_BEGV (buf)) orig_end = BUF_BEGV (buf);
898 if (orig_end > BUF_ZV (buf)) orig_end = BUF_ZV (buf); 898 if (orig_end > BUF_ZV (buf)) orig_end = BUF_ZV (buf);
899 899
900 MAP_INDIRECT_BUFFERS (buf, mbuf, bufcons) 900 MAP_INDIRECT_BUFFERS (buf, mbuf, bufcons)
901 { 901 {
902 XSETBUFFER (buffer, mbuf); 902 buffer = wrap_buffer (mbuf);
903 report_extent_modification (buffer, start, new_end, 1); 903 report_extent_modification (buffer, start, new_end, 1);
904 } 904 }
905 unbind_to (speccount); /* sets inside_change_hook back to 0 */ 905 unbind_to (speccount); /* sets inside_change_hook back to 0 */
906 } 906 }
907 } 907 }
928 barf_if_buffer_read_only (mbuf, start, end); 928 barf_if_buffer_read_only (mbuf, start, end);
929 } 929 }
930 930
931 /* if this is the first modification, see about locking the buffer's 931 /* if this is the first modification, see about locking the buffer's
932 file */ 932 file */
933 XSETBUFFER (buffer, buf); 933 buffer = wrap_buffer (buf);
934 GCPRO1 (buffer); 934 GCPRO1 (buffer);
935 if (!NILP (buf->filename) && lockit && 935 if (!NILP (buf->filename) && lockit &&
936 BUF_SAVE_MODIFF (buf) >= BUF_MODIFF (buf)) 936 BUF_SAVE_MODIFF (buf) >= BUF_MODIFF (buf))
937 { 937 {
938 #ifdef CLASH_DETECTION 938 #ifdef CLASH_DETECTION
1083 ind = charbpos_to_bytebpos (buf, pos); 1083 ind = charbpos_to_bytebpos (buf, pos);
1084 1084
1085 /* string may have been relocated up to this point */ 1085 /* string may have been relocated up to this point */
1086 if (STRINGP (reloc)) 1086 if (STRINGP (reloc))
1087 { 1087 {
1088 cclen = XSTRING_OFFSET_BYTE_TO_CHAR_LEN (reloc, offset, length); 1088 cclen = string_offset_byte_to_char_len (reloc, offset, length);
1089 nonreloc = XSTRING_DATA (reloc); 1089 nonreloc = XSTRING_DATA (reloc);
1090 } 1090 }
1091 else 1091 else
1092 cclen = bytecount_to_charcount (nonreloc + offset, length); 1092 cclen = bytecount_to_charcount (nonreloc + offset, length);
1093 1093
1667 barf_if_buffer_read_only (struct buffer *buf, Charbpos from, Charbpos to) 1667 barf_if_buffer_read_only (struct buffer *buf, Charbpos from, Charbpos to)
1668 { 1668 {
1669 Lisp_Object buffer; 1669 Lisp_Object buffer;
1670 Lisp_Object iro; 1670 Lisp_Object iro;
1671 1671
1672 XSETBUFFER (buffer, buf); 1672 buffer = wrap_buffer (buf);
1673 back: 1673 back:
1674 iro = (buf == current_buffer ? Vinhibit_read_only : 1674 iro = (buf == current_buffer ? Vinhibit_read_only :
1675 symbol_value_in_buffer (Qinhibit_read_only, buffer)); 1675 symbol_value_in_buffer (Qinhibit_read_only, buffer));
1676 if (!LISTP (iro)) 1676 if (!LISTP (iro))
1677 return; 1677 return;