aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorGlenn Morris2008-09-11 06:18:24 +0000
committerGlenn Morris2008-09-11 06:18:24 +0000
commit6f3122a737cddf4b9e4ea75364ca3c3e872b7024 (patch)
tree2189dca3b430adb2de6625c18a0ad1d0a23df3f3 /src
parent7103fd599b4eb1610e35721ee4ebe95cc32499b8 (diff)
downloademacs-6f3122a737cddf4b9e4ea75364ca3c3e872b7024.tar.gz
emacs-6f3122a737cddf4b9e4ea75364ca3c3e872b7024.zip
(charset-map-path): Doc fix.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog4
-rw-r--r--src/charset.c2
2 files changed, 5 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index f084924ac7b..e16899d101a 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
12008-09-11 Glenn Morris <rgm@gnu.org>
2
3 * charset.c (charset-map-path): Doc fix.
4
12008-09-10 Kenichi Handa <handa@m17n.org> 52008-09-10 Kenichi Handa <handa@m17n.org>
2 6
3 * xdisp.c (handle_composition_prop): Set it->cmp_it.ch to -1. 7 * xdisp.c (handle_composition_prop): Set it->cmp_it.ch to -1.
diff --git a/src/charset.c b/src/charset.c
index a08089d6d2c..217f51b15fb 100644
--- a/src/charset.c
+++ b/src/charset.c
@@ -2142,7 +2142,7 @@ syms_of_charset ()
2142 defsubr (&Scharset_id_internal); 2142 defsubr (&Scharset_id_internal);
2143 2143
2144 DEFVAR_LISP ("charset-map-path", &Vcharset_map_path, 2144 DEFVAR_LISP ("charset-map-path", &Vcharset_map_path,
2145 doc: /* *Lisp of directories to search for charset map files. */); 2145 doc: /* *List of directories to search for charset map files. */);
2146 Vcharset_map_path = Qnil; 2146 Vcharset_map_path = Qnil;
2147 2147
2148 DEFVAR_LISP ("charset-list", &Vcharset_list, 2148 DEFVAR_LISP ("charset-list", &Vcharset_list,