# HG changeset patch
# User Aidan Kehoe <kehoea@parhasard.net>
# Date 1232283085 0
# Node ID c02fdef8db8bb4fdb7c9e503d12bd5b56181c037
# Parent  68f74b080e9421c23fc2b7d36809d46a1ff02a40# Parent  1d11ecca9cd06c9151cb69e55ccc2ebbd998d9b7
Merge.

diff -r 68f74b080e94 -r c02fdef8db8b src/ChangeLog
--- a/src/ChangeLog	Sun Jan 18 12:41:58 2009 +0000
+++ b/src/ChangeLog	Sun Jan 18 12:51:25 2009 +0000
@@ -1,3 +1,9 @@
+2009-01-16  Aidan Kehoe  <kehoea@parhasard.net>
+
+	* chartab.c (print_table_entry): 
+	Print char table values correctly, eliminating some confusion
+	between symbols and strings.
+
 2009-01-10  Aidan Kehoe <kehoea@parhasard.net>
 
 	* objects-msw.c (mswindows_font_spec_matches_charset_stage_2): 
diff -r 68f74b080e94 -r c02fdef8db8b src/chartab.c
--- a/src/chartab.c	Sun Jan 18 12:41:58 2009 +0000
+++ b/src/chartab.c	Sun Jan 18 12:51:25 2009 +0000
@@ -317,7 +317,7 @@
   a->first = 0;
   lisprange = encode_char_table_range (range);
   GCPRO1 (lisprange);
-  write_fmt_string_lisp (a->printcharfun, "%s %s", 2, lisprange, val);
+  write_fmt_string_lisp (a->printcharfun, "%s %S", 2, lisprange, val);
   UNGCPRO;
   return 0;
 }
diff -r 68f74b080e94 -r c02fdef8db8b tests/ChangeLog
--- a/tests/ChangeLog	Sun Jan 18 12:41:58 2009 +0000
+++ b/tests/ChangeLog	Sun Jan 18 12:51:25 2009 +0000
@@ -1,3 +1,8 @@
+2009-01-18  Aidan Kehoe  <kehoea@parhasard.net>
+
+	* automated/lisp-tests.el: 
+	Check that a bug I fixed in char table printing is really gone. 
+
 2009-01-11  Aidan Kehoe  <kehoea@parhasard.net>
 
 	* automated/lisp-tests.el (): 
diff -r 68f74b080e94 -r c02fdef8db8b tests/automated/lisp-tests.el
--- a/tests/automated/lisp-tests.el	Sun Jan 18 12:41:58 2009 +0000
+++ b/tests/automated/lisp-tests.el	Sun Jan 18 12:51:25 2009 +0000
@@ -1327,3 +1327,9 @@
 					printed-with-uninterned)))
   (Assert (null (string-match awkward-regexp printed-with-uninterned
 			      (1+ first-match-start)))))
+
+(let ((char-table-with-string #s(char-table data (?\x00 "text")))
+      (char-table-with-symbol #s(char-table data (?\x00 text))))
+  (Assert (not (string-equal char-table-with-string char-table-with-symbol))
+          "Check that char table elements are quoted correctly when printing"))
+