Mercurial > hg > xemacs-beta

comparison src/doc.c @ 4953:304aebb79cd3

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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 19a72041c5ed
children e813cf16c015
comparison
equal deleted inserted replaced
4952:19a72041c5ed 4953:304aebb79cd3
63 doc_pos - buffer_size : 0; 63 doc_pos - buffer_size : 0;
64 64
65 if (0 > lseek (fd, position, 0)) 65 if (0 > lseek (fd, position, 0))
66 { 66 {
67 if (name_nonreloc) 67 if (name_nonreloc)
68 name_reloc = build_intstring (name_nonreloc); 68 name_reloc = build_istring (name_nonreloc);
69 return_me = list3 (build_msg_string 69 return_me = list3 (build_msg_string
70 ("Position out of range in doc string file"), 70 ("Position out of range in doc string file"),
71 name_reloc, make_int (position)); 71 name_reloc, make_int (position));
72 goto done; 72 goto done;
73 } 73 }
178 GCPRO2 (fdstream, instream); 178 GCPRO2 (fdstream, instream);
179 179
180 if (0 > lseek (fd, position, 0)) 180 if (0 > lseek (fd, position, 0))
181 { 181 {
182 if (name_nonreloc) 182 if (name_nonreloc)
183 name_reloc = build_intstring (name_nonreloc); 183 name_reloc = build_istring (name_nonreloc);
184 return_me = list3 (build_msg_string 184 return_me = list3 (build_msg_string
185 ("Position out of range in doc string file"), 185 ("Position out of range in doc string file"),
186 name_reloc, make_int (position)); 186 name_reloc, make_int (position));
187 goto done; 187 goto done;
188 } 188 }
376 fd = qxe_open (name_nonreloc, O_RDONLY | OPEN_BINARY, 0); 376 fd = qxe_open (name_nonreloc, O_RDONLY | OPEN_BINARY, 0);
377 } 377 }
378 378
379 if (fd < 0) 379 if (fd < 0)
380 report_file_error ("Cannot open doc string file", 380 report_file_error ("Cannot open doc string file",
381 name_nonreloc ? build_intstring (name_nonreloc) : 381 name_nonreloc ? build_istring (name_nonreloc) :
382 name_reloc); 382 name_reloc);
383 } 383 }
384 384
385 tem = unparesseuxify_doc_string (fd, position, name_nonreloc, name_reloc, 385 tem = unparesseuxify_doc_string (fd, position, name_nonreloc, name_reloc,
386 standard_doc_file); 386 standard_doc_file);
473 fd = qxe_open (name_nonreloc, O_RDONLY | OPEN_BINARY, 0); 473 fd = qxe_open (name_nonreloc, O_RDONLY | OPEN_BINARY, 0);
474 } 474 }
475 475
476 if (fd < 0) 476 if (fd < 0)
477 report_file_error ("Cannot open doc string file", 477 report_file_error ("Cannot open doc string file",
478 name_nonreloc ? build_intstring (name_nonreloc) : 478 name_nonreloc ? build_istring (name_nonreloc) :
479 name_reloc); 479 name_reloc);
480 } 480 }
481 481
482 tem = extract_object_file_name (fd, position, name_nonreloc, name_reloc, 482 tem = extract_object_file_name (fd, position, name_nonreloc, name_reloc,
483 standard_doc_file); 483 standard_doc_file);
597 if (SUBRP (fun)) 597 if (SUBRP (fun))
598 { 598 {
599 if (XSUBR (fun)->doc == 0) 599 if (XSUBR (fun)->doc == 0)
600 return Qnil; 600 return Qnil;
601 if ((EMACS_INT) XSUBR (fun)->doc >= 0) 601 if ((EMACS_INT) XSUBR (fun)->doc >= 0)
602 doc = build_string (XSUBR (fun)->doc); 602 doc = build_cistring (XSUBR (fun)->doc);
603 else 603 else
604 doc = get_doc_string (make_int (- (EMACS_INT) XSUBR (fun)->doc)); 604 doc = get_doc_string (make_int (- (EMACS_INT) XSUBR (fun)->doc));
605 } 605 }
606 else if (COMPILED_FUNCTIONP (fun)) 606 else if (COMPILED_FUNCTIONP (fun))
607 { 607 {
752 752
753 qxestrcat (name, XSTRING_DATA (filename)); 753 qxestrcat (name, XSTRING_DATA (filename));
754 754
755 fd = qxe_open (name, O_RDONLY | OPEN_BINARY, 0); 755 fd = qxe_open (name, O_RDONLY | OPEN_BINARY, 0);
756 if (fd < 0) 756 if (fd < 0)
757 report_file_error ("Opening doc string file", build_intstring (name)); 757 report_file_error ("Opening doc string file", build_istring (name));
758 Vinternal_doc_file_name = filename; 758 Vinternal_doc_file_name = filename;
759 filled = 0; 759 filled = 0;
760 pos = 0; 760 pos = 0;
761 while (1) 761 while (1)
762 { 762 {
1241 tem = get_keymap (tem, 0, 1); 1241 tem = get_keymap (tem, 0, 1);
1242 } 1242 }
1243 1243
1244 if (NILP (tem)) 1244 if (NILP (tem))
1245 { 1245 {
1246 buffer_insert_c_string (buf_, "(uses keymap \""); 1246 buffer_insert_ascstring (buf_, "(uses keymap \"");
1247 buffer_insert_lisp_string (buf_, Fsymbol_name (name)); 1247 buffer_insert_lisp_string (buf_, Fsymbol_name (name));
1248 buffer_insert_c_string (buf_, "\", which is not currently defined) "); 1248 buffer_insert_ascstring (buf_, "\", which is not currently defined) ");
1249 1249
1250 if (start[-1] == '<') keymap = Qnil; 1250 if (start[-1] == '<') keymap = Qnil;
1251 } 1251 }
1252 else if (start[-1] == '<') 1252 else if (start[-1] == '<')
1253 keymap = tem; 1253 keymap = tem;