diff options
| author | Paul Eggert | 2012-04-09 15:54:59 -0700 |
|---|---|---|
| committer | Paul Eggert | 2012-04-09 15:54:59 -0700 |
| commit | 45e9f7da84c1bd3fc0d36d05c5708ed3b2d3a193 (patch) | |
| tree | 5bc87a8b5a3c754b8eb44a612cc6c03561d6b968 /src/charset.c | |
| parent | 9d6b4d53469a9ffd67bd770fabc6fe254e35c21d (diff) | |
| parent | 05920a43fc18e696b464387e781e7cfdcea5b5af (diff) | |
| download | emacs-45e9f7da84c1bd3fc0d36d05c5708ed3b2d3a193.tar.gz emacs-45e9f7da84c1bd3fc0d36d05c5708ed3b2d3a193.zip | |
Merge from trunk.
Diffstat (limited to 'src/charset.c')
| -rw-r--r-- | src/charset.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/charset.c b/src/charset.c index 688247de1b0..6ecc8d2c4d1 100644 --- a/src/charset.c +++ b/src/charset.c | |||
| @@ -2395,7 +2395,7 @@ syms_of_charset (void) | |||
| 2395 | defsubr (&Ssort_charsets); | 2395 | defsubr (&Ssort_charsets); |
| 2396 | 2396 | ||
| 2397 | DEFVAR_LISP ("charset-map-path", Vcharset_map_path, | 2397 | DEFVAR_LISP ("charset-map-path", Vcharset_map_path, |
| 2398 | doc: /* *List of directories to search for charset map files. */); | 2398 | doc: /* List of directories to search for charset map files. */); |
| 2399 | Vcharset_map_path = Qnil; | 2399 | Vcharset_map_path = Qnil; |
| 2400 | 2400 | ||
| 2401 | DEFVAR_BOOL ("inhibit-load-charset-map", inhibit_load_charset_map, | 2401 | DEFVAR_BOOL ("inhibit-load-charset-map", inhibit_load_charset_map, |