Mercurial > hg > xemacs-beta
annotate src/insdel.h @ 4953:304aebb79cd3
function renamings to track names of char typedefs
-------------------- ChangeLog entries follow: --------------------
man/ChangeLog addition:
2010-01-27 Ben Wing <ben@xemacs.org>
* internals/internals.texi (lrecords):
* internals/internals.texi (The DFC API):
* internals/internals.texi (Conversion to and from External Data):
* internals/internals.texi (Mule-izing Code):
* internals/internals.texi (Pervasive changes throughout XEmacs sources):
* internals/internals.texi (Ben's README):
* internals/internals.texi (Future Work -- Localized Text/Messages):
* emodules.texi (Defining Variables):
Rename:
write_c_string -> write_cistring
build_intstring -> build_istring
build_string -> build_cistring
build_ext_string -> build_extstring
make_ext_string -> make_extstring
buffer_insert_c_string -> buffer_insert_ascstring
intern_int -> intern_istring
See comment in src/ChangeLog about this.
modules/ChangeLog addition:
2010-01-27 Ben Wing <ben@xemacs.org>
* postgresql/postgresql.c (print_pgconn):
* postgresql/postgresql.c (print_pgresult):
* postgresql/postgresql.c (Fpq_conn_defaults):
* postgresql/postgresql.c (Fpq_pgconn):
* postgresql/postgresql.c (Fpq_res_status):
* postgresql/postgresql.c (Fpq_result_error_message):
* postgresql/postgresql.c (Fpq_fname):
* postgresql/postgresql.c (Fpq_get_value):
* postgresql/postgresql.c (Fpq_cmd_status):
* postgresql/postgresql.c (Fpq_cmd_tuples):
* postgresql/postgresql.c (Fpq_notifies):
* postgresql/postgresql.c (Fpq_get_line):
* postgresql/postgresql.c (Fpq_get_line_async):
* postgresql/postgresql.c (FROB):
* postgresql/postgresql.c (init_postgresql_from_environment):
* ldap/eldap.c:
* ldap/eldap.c (Fldap_open):
* ldap/eldap.c (Fldap_search_basic):
* canna/canna_api.c:
* canna/canna_api.c (make_euc_string):
Rename:
write_c_string -> write_cistring
build_intstring -> build_istring
build_string -> build_cistring
build_ext_string -> build_extstring
make_ext_string -> make_extstring
buffer_insert_c_string -> buffer_insert_ascstring
intern_int -> intern_istring
See comment in src/ChangeLog about this.
src/ChangeLog addition:
2010-01-27 Ben Wing <ben@xemacs.org>
* .gdbinit.in.in:
* README:
* abbrev.c (write_abbrev):
* abbrev.c (describe_abbrev):
* alloc.c (make_extstring):
* alloc.c (build_istring):
* alloc.c (build_cistring):
* alloc.c (build_ascstring):
* alloc.c (build_extstring):
* alloc.c (build_msg_istring):
* alloc.c (build_defer_istring):
* buffer.c (Fgenerate_new_buffer_name):
* buffer.c (init_buffer_2):
* console-tty.c (tty_init_console):
* console-x.c (get_display_arg_connection):
* console-x.c (x_perhaps_init_unseen_key_defaults):
* database.c (dbm_map):
* database.c (dbm_get):
* database.c (berkdb_get):
* database.c (berkdb_map):
* device-gtk.c (FROB_PIXMAP):
* device-gtk.c (Fgtk_style_info):
* device-msw.c (msprinter_default_printer):
* device-msw.c (sync_printer_with_devmode):
* device-x.c (coding_system_of_xrm_database):
* device-x.c (x_init_device):
* device-x.c (signal_if_x_error):
* device-x.c (Fx_get_resource):
* device-x.c (Fx_server_vendor):
* device-x.c (Fx_get_font_path):
* dialog-x.c (maybe_run_dbox_text_callback):
* doc.c (extract_object_file_name):
* doc.c (unparesseuxify_doc_string):
* doc.c (get_doc_string):
* doc.c (get_object_file_name):
* doc.c (Fdocumentation):
* doc.c (Fsnarf_documentation):
* doc.c (Fsubstitute_command_keys):
* editfns.c (init_editfns):
* editfns.c (Ftemp_directory):
* editfns.c (Fuser_login_name):
* editfns.c (Fuser_real_login_name):
* editfns.c (Fuser_home_directory):
* editfns.c (Fformat_time_string):
* editfns.c (Fcurrent_time_string):
* editfns.c (Fcurrent_time_zone):
* emacs.c:
* emacs.c (main_1):
* emodules.c (Flist_modules):
* emodules.c (emodules_load):
* emodules.c (emodules_doc_sym):
* emodules.c (vars_of_module):
* event-Xt.c (x_has_keysym):
* event-gtk.c (emacs_gtk_format_magic_event):
* event-gtk.c (dragndrop_data_received):
* event-gtk.c (gtk_reset_key_mapping):
* event-msw.c (mswindows_dde_callback):
* event-msw.c (mswindows_wnd_proc):
* faces.c (complex_vars_of_faces):
* file-coding.c (find_coding_system):
* file-coding.c (setup_eol_coding_systems):
* file-coding.c (make_coding_system_1):
* file-coding.c (snarf_coding_system):
* fileio.c:
* fileio.c (lisp_strerror):
* fileio.c (Ffile_name_directory):
* fileio.c (Ffile_name_as_directory):
* fileio.c (Fdirectory_file_name):
* fileio.c (if):
* fileio.c (Ffile_symlink_p):
* fileio.c (Fencrypt_string):
* fileio.c (Fdecrypt_string):
* filelock.c (lock_file):
* filelock.c (Ffile_locked_p):
* floatfns.c (matherr):
* font-mgr.c (build_fcapi_string):
* font-mgr.c (make_xlfd_font_regexp):
* frame-msw.c (mswindows_window_id):
* frame-msw.c (mswindows_frame_property):
* frame-x.c:
* frame-x.c (color_to_string):
* frame-x.c (maybe_set_frame_title_format):
* frame-x.c (x_cde_transfer_callback):
* frame-x.c (Fx_window_id):
* glade.c (connector):
* glade.c (Fglade_xml_textdomain):
* glade.c (syms_of_glade):
* glyphs-eimage.c (jpeg_instantiate):
* glyphs-eimage.c (png_instantiate):
* glyphs-eimage.c (tiff_instantiate):
* glyphs-gtk.c (font_instantiate):
* glyphs-gtk.c (BUILD_GLYPH_INST):
* glyphs-x.c (x_locate_pixmap_file):
* glyphs-x.c (font_instantiate):
* glyphs-x.c (x_widget_property):
* glyphs-x.c (BUILD_GLYPH_INST):
* glyphs.c (print_image_instance):
* glyphs.c (bitmap_to_lisp_data):
* glyphs.c (pixmap_to_lisp_data):
* gpmevent.c (turn_off_gpm):
* gpmevent.c (Fgpm_enabled_p):
* gpmevent.c (Fgpm_enable):
* gtk-glue.c (__make_string_mapper):
* gtk-glue.c (xemacs_gtklist_to_list):
* gtk-xemacs.c (FROB_FACE):
* gtk-xemacs.c (xemacs_gtk_convert_color):
* hpplay.c (player_error_internal):
* hpplay.c (myHandler):
* insdel.c (buffer_insert_ascstring_1):
* insdel.h:
* insdel.h (buffer_insert_ascstring):
* intl.c (Fcurrent_locale):
* intl.c (Fset_current_locale):
* keymap.c (make_key_description):
* keymap.c (Ftext_char_description):
* keymap.c (describe_command):
* keymap.c (describe_map):
* lisp.h:
* lread.c:
* lread.c (locate_file_in_directory_mapper):
* lread.c (locate_file_construct_suffixed_files_mapper):
* mule-charset.c (Fmake_charset):
* nt.c (Fmswindows_short_file_name):
* nt.c (Fmswindows_long_file_name):
* objects-gtk.c (__get_gtk_font_truename):
* objects-gtk.c (__gtk_font_list_internal):
* objects-msw.c (font_enum_callback_2):
* objects-msw.c (create_hfont_from_font_spec):
* objects-msw.c (mswindows_font_list):
* objects-msw.c (mswindows_font_spec_matches_charset_stage_2):
* objects-tty.c (tty_initialize_font_instance):
* objects-x.c (x_font_truename):
* objects-x.c (x_font_instance_truename):
* objects-x.c (x_font_instance_properties):
* objects-x.c (x_font_list):
* print.c (write_cistring):
* print.c (print_vector_internal):
* print.c (print_cons):
* process-nt.c (nt_canonicalize_host_name):
* process-unix.c (unix_create_process):
* process-unix.c (unix_canonicalize_host_name):
* process.c (status_message):
* process.c (status_notify):
* process.c (init_xemacs_process):
* process.c (syms_of_process):
* redisplay-tty.c (term_get_fkeys_1):
* redisplay-tty.c (CONDITIONAL_REASSIGN):
* search.c (compile_pattern_1):
* select-common.h (selection_data_to_lisp_data):
* select-gtk.c (atom_to_symbol):
* select-gtk.c (PROCESSING_GTK_CODE):
* select-msw.c (mswindows_get_foreign_selection):
* select-x.c (x_atom_to_symbol):
* select-x.c (Fx_get_cutbuffer_internal):
* symbols.c (intern_istring):
* symbols.c (intern):
* symbols.c (intern_converting_underscores_to_dashes):
* symbols.c (Fintern):
* sysdep.c (init_system_name):
* sysdll.c (dll_error):
* sysdll.c (dll_open):
* syswindows.h:
* syswindows.h (build_tstr_string):
* tests.c (DFC_CHECK_LENGTH):
* tests.c (DFC_CHECK_CONTENT):
* tests.c (DFC_RESULT_PASS):
* tests.c (Ftest_data_format_conversion):
* text.c:
* text.c (new_dfc_convert_now_damn_it):
* text.h:
* text.h (build_wext_string):
* tooltalk.c (tt_build_c_string):
* tooltalk.c (Ftooltalk_default_procid):
* tooltalk.c (Ftooltalk_default_session):
* tooltalk.c (init_tooltalk):
* ui-byhand.c (Fgtk_clist_get_text):
* ui-byhand.c (Fgtk_clist_get_pixtext):
* ui-byhand.c (Fgtk_label_get):
* ui-byhand.c (Fgtk_notebook_query_tab_label_packing):
* ui-gtk.c (emacs_gtk_object_printer):
* ui-gtk.c (emacs_gtk_boxed_printer):
* ui-gtk.c (gtk_type_to_lisp):
* ui-gtk.c (symbol_to_enum):
* ui-gtk.c (enum_to_symbol):
* unexaix.c (report_error):
* unexaix.c (ERROR0):
* unexec.c (report_error):
* unexec.c (ERROR0):
* unicode.c (unicode_to_ichar):
* win32.c (tstr_to_local_file_format):
* win32.c (Fmswindows_cygwin_to_win32_path):
* win32.c (struct read_link_hash):
* xemacs.def.in.in:
Rename:
write_c_string -> write_cistring
build_intstring -> build_istring
build_string -> build_cistring
build_ext_string -> build_extstring
make_ext_string -> make_extstring
buffer_insert_c_string -> buffer_insert_ascstring
intern_int -> intern_istring
These functions have been renamed so that the naming harmonizes
with the typedefs for strings: `cistring' along with CIbyte *,
`istring' along with Ibyte *, `extstring' along with Extbyte *,
`ascstring' along with Ascbyte *.
Also make buffer_insert_ascstring take Ascbyte * and assert
that its argument is ASCII.
| author | Ben Wing <ben@xemacs.org> |
|---|---|
| date | Wed, 27 Jan 2010 00:35:36 -0600 |
| parents | 804517e16990 |
| children | 308d34e9f07d |
| rev | line source |
|---|---|
| 428 | 1 /* Buffer insertion/deletion and gap motion for XEmacs. |
| 2 Copyright (C) 1985-1994 Free Software Foundation, Inc. | |
| 3 | |
| 4 This file is part of XEmacs. | |
| 5 | |
| 6 XEmacs is free software; you can redistribute it and/or modify it | |
| 7 under the terms of the GNU General Public License as published by the | |
| 8 Free Software Foundation; either version 2, or (at your option) any | |
| 9 later version. | |
| 10 | |
| 11 XEmacs is distributed in the hope that it will be useful, but WITHOUT | |
| 12 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or | |
| 13 FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License | |
| 14 for more details. | |
| 15 | |
| 16 You should have received a copy of the GNU General Public License | |
| 17 along with XEmacs; see the file COPYING. If not, write to | |
| 18 the Free Software Foundation, Inc., 59 Temple Place - Suite 330, | |
| 19 Boston, MA 02111-1307, USA. */ | |
| 20 | |
| 21 /* Synched up with: Not in FSF. */ | |
| 22 | |
| 23 /* Mostly rewritten by Ben Wing. */ | |
| 24 | |
| 440 | 25 #ifndef INCLUDED_insdel_h_ |
| 26 #define INCLUDED_insdel_h_ | |
| 428 | 27 |
| 28 /************************************************************************/ | |
| 29 /* changing a buffer's text */ | |
| 30 /************************************************************************/ | |
| 31 | |
| 665 | 32 int begin_multiple_change (struct buffer *buf, Charbpos start, Charbpos end); |
| 428 | 33 void end_multiple_change (struct buffer *buf, int count); |
| 34 | |
| 35 /* flags for functions below */ | |
| 36 | |
| 37 #define INSDEL_BEFORE_MARKERS 1 | |
| 38 #define INSDEL_NO_LOCKING 2 | |
| 39 | |
| 665 | 40 Charcount buffer_insert_string_1 (struct buffer *buf, Charbpos pos, |
| 867 | 41 const Ibyte *nonreloc, Lisp_Object reloc, |
| 428 | 42 Bytecount offset, Bytecount length, |
| 43 int flags); | |
| 665 | 44 Charcount buffer_insert_raw_string_1 (struct buffer *buf, Charbpos pos, |
| 867 | 45 const Ibyte *nonreloc, |
| 428 | 46 Bytecount length, int flags); |
| 665 | 47 Charcount buffer_insert_lisp_string_1 (struct buffer *buf, Charbpos pos, |
| 428 | 48 Lisp_Object str, int flags); |
|
4953
304aebb79cd3
function renamings to track names of char typedefs
Ben Wing <ben@xemacs.org>
parents:
867
diff
changeset
|
49 Charcount buffer_insert_ascstring_1 (struct buffer *buf, Charbpos pos, |
|
304aebb79cd3
function renamings to track names of char typedefs
Ben Wing <ben@xemacs.org>
parents:
867
diff
changeset
|
50 const Ascbyte *s, int flags); |
| 665 | 51 Charcount buffer_insert_emacs_char_1 (struct buffer *buf, Charbpos pos, |
| 867 | 52 Ichar ch, int flags); |
| 665 | 53 Charcount buffer_insert_c_char_1 (struct buffer *buf, Charbpos pos, char c, |
| 428 | 54 int flags); |
| 665 | 55 Charcount buffer_insert_from_buffer_1 (struct buffer *buf, Charbpos pos, |
| 56 struct buffer *buf2, Charbpos pos2, | |
| 428 | 57 Charcount length, int flags); |
| 58 | |
| 59 /* Macros for insertion functions that insert at point after markers. | |
| 60 All of these can GC. */ | |
| 61 | |
| 62 #define buffer_insert_string(buf, nonreloc, reloc, offset, length) \ | |
| 63 buffer_insert_string_1 (buf, -1, nonreloc, reloc, offset, length, 0) | |
| 64 #define buffer_insert_raw_string(buf, string, length) \ | |
| 65 buffer_insert_raw_string_1 (buf, -1, string, length, 0) | |
|
4953
304aebb79cd3
function renamings to track names of char typedefs
Ben Wing <ben@xemacs.org>
parents:
867
diff
changeset
|
66 #define buffer_insert_ascstring(buf, s) \ |
|
304aebb79cd3
function renamings to track names of char typedefs
Ben Wing <ben@xemacs.org>
parents:
867
diff
changeset
|
67 buffer_insert_ascstring_1 (buf, -1, s, 0) |
| 428 | 68 #define buffer_insert_lisp_string(buf, str) \ |
| 69 buffer_insert_lisp_string_1 (buf, -1, str, 0) | |
| 70 #define buffer_insert_c_char(buf, c) \ | |
| 71 buffer_insert_c_char_1 (buf, -1, c, 0) | |
| 72 #define buffer_insert_emacs_char(buf, ch) \ | |
| 73 buffer_insert_emacs_char_1 (buf, -1, ch, 0) | |
| 74 #define buffer_insert_from_buffer(buf, b, index, length) \ | |
| 75 buffer_insert_from_buffer_1 (buf, -1, b, index, length, 0) | |
| 76 | |
| 665 | 77 void buffer_delete_range (struct buffer *buf, Charbpos from, Charbpos to, |
| 428 | 78 int flags); |
| 867 | 79 void buffer_replace_char (struct buffer *b, Charbpos pos, Ichar ch, |
| 428 | 80 int not_real_change, int force_lock_check); |
| 81 | |
| 82 | |
| 83 /************************************************************************/ | |
| 84 /* tracking buffer changes */ | |
| 85 /************************************************************************/ | |
| 86 | |
| 87 /* Split into two parts. One part goes with a buffer's text (possibly | |
| 88 shared), the other with the buffer itself. */ | |
| 89 | |
| 90 struct buffer_text_change_data | |
| 91 { | |
| 92 /* multiple change stuff */ | |
| 93 int in_multiple_change; | |
| 665 | 94 Charbpos mc_begin, mc_orig_end, mc_new_end; |
| 428 | 95 int mc_begin_signaled; |
| 96 }; | |
| 97 | |
| 98 struct each_buffer_change_data | |
| 99 { | |
| 100 Charcount begin_unchanged, end_unchanged; | |
| 101 /* redisplay needs to know if a newline was deleted so its | |
| 102 incremental-redisplay algorithm will fail */ | |
| 103 int newline_was_deleted; | |
| 104 Charcount begin_extent_unchanged, end_extent_unchanged; | |
| 105 }; | |
| 106 | |
| 107 /* Number of characters at the beginning and end of the buffer that | |
| 108 have not changed since the last call to buffer_reset_changes(). | |
| 109 If no changes have occurred since then, both values will be -1. | |
| 110 | |
| 111 "Changed" means that the text has changed. */ | |
| 112 | |
| 113 #define BUF_BEGIN_UNCHANGED(buf) ((buf)->changes->begin_unchanged) | |
| 114 #define BUF_END_UNCHANGED(buf) ((buf)->changes->end_unchanged) | |
| 115 | |
| 116 /* Number of characters at the beginning and end of the buffer that | |
| 117 have not had a covering extent change since the last call to | |
| 118 buffer_reset_changes (). If no changes have occurred since then, | |
| 119 both values will be -1. | |
| 120 | |
| 121 "Changed" means that the extents covering the text have changed. */ | |
| 122 | |
| 123 #define BUF_EXTENT_BEGIN_UNCHANGED(buf) \ | |
| 124 ((buf)->changes->begin_extent_unchanged) | |
| 125 #define BUF_EXTENT_END_UNCHANGED(buf) \ | |
| 126 ((buf)->changes->end_extent_unchanged) | |
| 127 | |
| 128 #define BUF_NEWLINE_WAS_DELETED(buf) \ | |
| 129 ((buf)->changes->newline_was_deleted) | |
| 130 | |
| 131 void buffer_extent_signal_changed_region (struct buffer *buf, | |
| 665 | 132 Charbpos start, |
| 133 Charbpos end); | |
| 428 | 134 void buffer_reset_changes (struct buffer *buf); |
| 135 | |
| 136 | |
| 137 | |
| 138 /************************************************************************/ | |
| 139 /* other related functions */ | |
| 140 /************************************************************************/ | |
| 141 | |
| 665 | 142 Membpos do_marker_adjustment (Membpos mpos, Membpos from, |
| 143 Membpos to, Bytecount amount); | |
| 428 | 144 |
| 867 | 145 void fixup_internal_substring (const Ibyte *nonreloc, |
| 428 | 146 Lisp_Object reloc, |
| 147 Bytecount offset, Bytecount *len); | |
| 148 | |
| 149 /* In font-lock.c */ | |
| 150 void font_lock_maybe_update_syntactic_caches (struct buffer *buf, | |
| 665 | 151 Charbpos start, |
| 152 Charbpos orig_end, | |
| 153 Charbpos new_end); | |
| 428 | 154 void font_lock_buffer_was_killed (struct buffer *buf); |
| 155 | |
| 665 | 156 void barf_if_buffer_read_only (struct buffer *buf, Charbpos from, |
| 157 Charbpos to); | |
| 428 | 158 |
| 159 void init_buffer_text (struct buffer *b); | |
| 160 void uninit_buffer_text (struct buffer *b); | |
| 161 | |
| 440 | 162 #endif /* INCLUDED_insdel_h_ */ |