comparison src/charset.c @ 89787:cbb58e8c4481

(Vcharset_map_directory): Deleted. (Vcharset_map_path): New variable (load_charset_map_from_file): Use Vcharset_map_path instead. (init_charset): Initialize Vcharset_map_path. (syms_of_charset): Delete declaration of "charset-map-directory", add declaration of "charset-map-path".

89786:cce22763e5b1

/* Mapping table from ISO2022's charset (specified by DIMENSION,
   CHARS, and FINAL-CHAR) to Emacs' charset.  */
int iso_charset_table[ISO_MAX_DIMENSION][ISO_MAX_CHARS][ISO_MAX_FINAL];

Lisp_Object Vcharset_map_directory;

Lisp_Object Vchar_unified_charset_table;

/* Defined in chartab.c */
extern void

  int n_entries;

  suffixes = Fcons (build_string (".map"),
		    Fcons (build_string (".TXT"), Qnil));

  fd = openp (Fcons (Vcharset_map_directory, Qnil), mapfile, suffixes,
	      NULL, Qnil);
  if (fd < 0
      || ! (fp = fdopen (fd, "r")))
    {
      add_to_log ("Failure in loading charset map: %S", mapfile, Qnil);
      return;


void
init_charset ()
{

}


void
init_charset_once ()

  defsubr (&Sclear_charset_maps);
  defsubr (&Scharset_priority_list);
  defsubr (&Sset_charset_priority);
  defsubr (&Scharset_id_internal);

  DEFVAR_LISP ("charset-map-directory", &Vcharset_map_directory,
	       doc: /* Directory of charset map files that come with GNU Emacs.
The default value is sub-directory "charsets" of `data-directory'.  */);
  Vcharset_map_directory = Fexpand_file_name (build_string ("charsets"),
					      Vdata_directory);

  DEFVAR_LISP ("charset-list", &Vcharset_list,
	       doc: /* List of all charsets ever defined.  */);
  Vcharset_list = Qnil;

89787:cbb58e8c4481

/* Mapping table from ISO2022's charset (specified by DIMENSION,
   CHARS, and FINAL-CHAR) to Emacs' charset.  */
int iso_charset_table[ISO_MAX_DIMENSION][ISO_MAX_CHARS][ISO_MAX_FINAL];

Lisp_Object Vcharset_map_path;

Lisp_Object Vchar_unified_charset_table;

/* Defined in chartab.c */
extern void

  int n_entries;

  suffixes = Fcons (build_string (".map"),
		    Fcons (build_string (".TXT"), Qnil));

  fd = openp (Vcharset_map_path, mapfile, suffixes, NULL, Qnil);
  if (fd < 0
      || ! (fp = fdopen (fd, "r")))
    {
      add_to_log ("Failure in loading charset map: %S", mapfile, Qnil);
      return;


void
init_charset ()
{
  Vcharset_map_path
    = Fcons (Fexpand_file_name (build_string ("charsets"), Vdata_directory),
	     Qnil);
}


void
init_charset_once ()

  defsubr (&Sclear_charset_maps);
  defsubr (&Scharset_priority_list);
  defsubr (&Sset_charset_priority);
  defsubr (&Scharset_id_internal);

  DEFVAR_LISP ("charset-map-path", &Vcharset_map_path,
	       doc: /* *Lisp of directories to search for charset map files.  */);
  Vcharset_map_path = Qnil;

  DEFVAR_LISP ("charset-list", &Vcharset_list,
	       doc: /* List of all charsets ever defined.  */);
  Vcharset_list = Qnil;