Mercurial > hg > xemacs-beta
annotate src/intl.c @ 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 | 98af8a976fc3 |
| children | 16112448d484 4aebb0131297 |
| rev | line source |
|---|---|
| 771 | 1 /* Various functions for internationalizing XEmacs. |
| 428 | 2 Copyright (C) 1993, 1994, 1995 Board of Trustees, University of Illinois. |
| 826 | 3 Copyright (C) 2000, 2001, 2002 Ben Wing. |
| 428 | 4 |
| 5 This file is part of XEmacs. | |
| 6 | |
| 7 XEmacs is free software; you can redistribute it and/or modify it | |
| 8 under the terms of the GNU General Public License as published by the | |
| 9 Free Software Foundation; either version 2, or (at your option) any | |
| 10 later version. | |
| 11 | |
| 12 XEmacs is distributed in the hope that it will be useful, but WITHOUT | |
| 13 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or | |
| 14 FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License | |
| 15 for more details. | |
| 16 | |
| 17 You should have received a copy of the GNU General Public License | |
| 18 along with XEmacs; see the file COPYING. If not, write to | |
| 19 the Free Software Foundation, Inc., 59 Temple Place - Suite 330, | |
| 20 Boston, MA 02111-1307, USA. */ | |
| 21 | |
| 22 /* Synched up with: Not in FSF. */ | |
| 23 | |
| 24 #include <config.h> | |
| 25 #include "lisp.h" | |
| 26 | |
| 27 #if defined (HAVE_X_WINDOWS) && defined (HAVE_X11_XLOCALE_H) | |
| 28 #include <X11/Xlocale.h> | |
| 29 #else | |
| 30 #ifdef HAVE_LOCALE_H | |
| 31 #include <locale.h> | |
| 32 #endif | |
| 33 #endif | |
| 34 | |
| 771 | 35 #ifdef HAVE_X_WINDOWS |
| 36 int init_x_locale (Lisp_Object locale); | |
| 37 #endif | |
| 428 | 38 |
| 771 | 39 DEFUN ("current-locale", Fcurrent_locale, 0, 0, 0, /* |
| 40 Return the current locale. | |
| 41 This is of the form LANG_COUNTRY.ENCODING, or LANG_COUNTRY, or LANG, | |
| 42 or .ENCODING. Unfortunately, the meanings of these three values are | |
| 43 system-dependent, and there is no universal agreement. | |
| 44 */ | |
| 45 ()) | |
| 46 { | |
| 47 Extbyte *loc; | |
| 428 | 48 |
| 771 | 49 loc = setlocale (LC_CTYPE, NULL); |
| 50 if (!loc) | |
| 51 return Qnil; | |
|
4953
304aebb79cd3
function renamings to track names of char typedefs
Ben Wing <ben@xemacs.org>
parents:
3659
diff
changeset
|
52 return build_extstring (loc, Qctext); |
| 428 | 53 } |
| 54 | |
| 771 | 55 DEFUN ("set-current-locale", Fset_current_locale, 1, 1, 0, /* |
| 56 Set the user's current locale. | |
| 57 Takes a string, the value passed to setlocale(). | |
| 58 This is of the form LANG_COUNTRY.ENCODING, or LANG_COUNTRY, or LANG, | |
| 59 or .ENCODING. Unfortunately, the meanings of these three values are | |
| 60 system-dependent, and there is no universal agreement. This function | |
| 61 is meant to be called only from `set-language-environment', which | |
| 62 keeps tables to figure out the values to use for particular systems. | |
| 428 | 63 |
| 771 | 64 If the empty string is passed in, the locale is initialized from |
| 65 environment variables. | |
| 428 | 66 |
| 771 | 67 Returns nil if the call failed (typically, an invalid locale was given). |
| 68 Otherwise, returns the locale, or possibly a more-specified version. | |
| 428 | 69 */ |
| 771 | 70 (locale)) |
| 428 | 71 { |
| 771 | 72 Extbyte *loc; |
| 2946 | 73 Lisp_Object str; |
| 428 | 74 |
| 771 | 75 CHECK_STRING (locale); |
| 76 /* RedHat 6.2 contains a locale called "Francais" with the C-cedilla | |
| 77 encoded in ISO2022! */ | |
| 78 LISP_STRING_TO_EXTERNAL (locale, loc, Qctext); | |
| 79 loc = setlocale (LC_ALL, loc); | |
| 80 if (!loc) | |
| 81 return Qnil; | |
| 2946 | 82 loc = xstrdup (loc); |
| 83 setlocale (LC_NUMERIC, "C"); | |
| 771 | 84 #ifdef HAVE_X_WINDOWS |
| 85 if (!init_x_locale (locale)) | |
| 428 | 86 { |
| 771 | 87 /* Locale not supported under X. Put it back. */ |
| 88 setlocale (LC_ALL, loc); | |
| 89 setlocale (LC_NUMERIC, "C"); | |
| 2946 | 90 free (loc); |
| 771 | 91 return Qnil; |
| 428 | 92 } |
| 771 | 93 #endif |
| 428 | 94 |
|
4953
304aebb79cd3
function renamings to track names of char typedefs
Ben Wing <ben@xemacs.org>
parents:
3659
diff
changeset
|
95 str = build_extstring (loc, Qctext); |
| 2946 | 96 xfree (loc, Extbyte *); |
| 97 return str; | |
| 428 | 98 } |
| 771 | 99 |
| 100 #if 0 | |
| 428 | 101 |
| 771 | 102 /* #### some old code that I really want to nuke, but I'm not completely |
| 103 sure what it did, so I'll leave it until we get around to implementing | |
| 104 message-translation and decide whether the functionality that this | |
| 105 is trying to support makes any sense. --ben */ | |
| 428 | 106 |
| 107 Lisp_Object Qdefer_gettext; | |
| 108 | |
| 826 | 109 DEFUN ("ignore-defer-gettext", Fignore_defer_gettext, 1, 1, 0, /* |
| 444 | 110 If OBJECT is of the form (defer-gettext "string"), return the string. |
| 428 | 111 The purpose of the defer-gettext symbol is to identify strings which |
| 112 are translated when they are referenced instead of when they are defined. | |
| 113 */ | |
| 444 | 114 (object)) |
| 428 | 115 { |
| 444 | 116 if (CONSP (object) |
| 117 && SYMBOLP (Fcar (object)) | |
| 118 && EQ (Fcar (object), Qdefer_gettext)) | |
| 119 return Fcar (Fcdr (object)); | |
| 428 | 120 else |
| 444 | 121 return object; |
| 428 | 122 } |
| 123 | |
| 771 | 124 #endif /* 0 */ |
| 125 | |
| 428 | 126 DEFUN ("gettext", Fgettext, 1, 1, 0, /* |
| 127 Look up STRING in the default message domain and return its translation. | |
| 128 This function does nothing if I18N3 was not enabled when Emacs was compiled. | |
| 129 */ | |
| 130 (string)) | |
| 131 { | |
| 132 #ifdef I18N3 | |
| 133 /* #### What should happen here is: | |
| 134 | |
| 135 1) If the string has no `string-translatable' property or its value | |
| 136 is nil, no translation takes place. The `string-translatable' property | |
| 137 only gets added when a constant string is read in from a .el or .elc | |
| 138 file, to avoid excessive translation. (The user can also explicitly | |
| 139 add this property to a string.) | |
| 140 2) If the string's `string-translatable' property is a string, | |
| 141 that string should be returned. `format' add this property. | |
| 142 This allows translation to take place at the proper time but | |
| 143 avoids excessive translation if the string is not destined for | |
| 144 a translating stream. (See print_internal().) | |
| 145 3) If gettext() returns the same string, then Fgettext() should return | |
| 146 the same object, minus the 'string-translatable' property. */ | |
| 147 | |
| 148 #endif | |
| 149 return string; | |
| 150 } | |
| 151 | |
| 152 #ifdef I18N3 | |
| 153 | |
| 154 /* #### add the function `force-gettext', perhaps in Lisp. This | |
| 155 ignores the `string-translatable' property and simply calls gettext() | |
| 156 on the string. Add the functions `set-string-translatable' and | |
| 157 `set-stream-translating'. */ | |
| 158 | |
| 159 #endif | |
| 160 | |
| 161 | |
| 162 | |
| 163 /************************************************************************/ | |
| 164 /* initialization */ | |
| 165 /************************************************************************/ | |
| 166 | |
| 167 void | |
| 771 | 168 init_intl (void) |
| 428 | 169 { |
| 3659 | 170 /* This function cannot GC, because it explicitly prevents it. */ |
| 771 | 171 if (initialized) |
| 172 { | |
| 173 int count = begin_gc_forbidden (); | |
| 853 | 174 Lisp_Object args[2]; |
| 175 | |
| 771 | 176 specbind (Qinhibit_quit, Qt); |
| 853 | 177 args[0] = Qreally_early_error_handler; |
| 178 args[1] = intern ("init-locale-at-early-startup"); | |
| 179 Fcall_with_condition_handler (2, args); | |
| 180 | |
| 771 | 181 /* Should be calling this here, but problems with |
| 182 `data-directory' and locating the files. See comment in | |
| 183 mule-cmds.el:`init-mule-at-startup'. | |
| 428 | 184 |
| 853 | 185 args[1] = intern ("init-unicode-at-early-startup"); |
| 186 Fcall_with_condition_handler (2, args); | |
| 771 | 187 */ |
| 188 unbind_to (count); | |
| 189 } | |
| 428 | 190 } |
| 191 | |
| 192 void | |
| 193 syms_of_intl (void) | |
| 194 { | |
| 195 DEFSUBR (Fgettext); | |
| 771 | 196 DEFSUBR (Fset_current_locale); |
| 197 DEFSUBR (Fcurrent_locale); | |
| 428 | 198 } |
| 199 | |
| 200 void | |
| 201 vars_of_intl (void) | |
| 202 { | |
| 203 #ifdef I18N3 | |
| 204 Fprovide (intern ("i18n3")); | |
| 205 #endif | |
| 771 | 206 |
| 207 #ifdef MULE | |
| 208 Fprovide (intern ("mule")); | |
| 209 #endif /* MULE */ | |
| 428 | 210 } |