Mercurial > emacs
changeset 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".
| author | Kenichi Handa <handa@m17n.org> |
|---|---|
| date | Fri, 30 Jan 2004 02:14:46 +0000 |
| parents | cce22763e5b1 |
| children | 64f9915771f5 |
| files | src/charset.c |
| diffstat | 1 files changed, 8 insertions(+), 9 deletions(-) [+] |
line wrap: on
line diff
--- a/src/charset.c Fri Jan 30 02:12:07 2004 +0000 +++ b/src/charset.c Fri Jan 30 02:14:46 2004 +0000 @@ -110,7 +110,7 @@ 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 Vcharset_map_path; Lisp_Object Vchar_unified_charset_table; @@ -406,8 +406,7 @@ suffixes = Fcons (build_string (".map"), Fcons (build_string (".TXT"), Qnil)); - fd = openp (Fcons (Vcharset_map_directory, Qnil), mapfile, suffixes, - NULL, Qnil); + fd = openp (Vcharset_map_path, mapfile, suffixes, NULL, Qnil); if (fd < 0 || ! (fp = fdopen (fd, "r"))) { @@ -2039,7 +2038,9 @@ void init_charset () { - + Vcharset_map_path + = Fcons (Fexpand_file_name (build_string ("charsets"), Vdata_directory), + Qnil); } @@ -2131,11 +2132,9 @@ 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-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. */);