aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStefan Monnier2009-11-30 21:08:25 +0000
committerStefan Monnier2009-11-30 21:08:25 +0000
commit3e0de07fa8dffb0b2ff383f1921d25b916260c21 (patch)
tree9cb7139a3f5abec5e08c2d99c1c19d20d2541fcc
parent67296dda1e94b513613f31e66d54f464c3288c4b (diff)
downloademacs-3e0de07fa8dffb0b2ff383f1921d25b916260c21.tar.gz
emacs-3e0de07fa8dffb0b2ff383f1921d25b916260c21.zip
(print_preprocess): Preprocess the key_and_value table of
hashtables, even tho they're "hidden" (bug#5082).
-rw-r--r--src/ChangeLog7
-rw-r--r--src/print.c7
2 files changed, 13 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 7d5525c781e..4d539a30861 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
12009-11-30 Stefan Monnier <monnier@iro.umontreal.ca>
2
3 * print.c (print_preprocess): Preprocess the key_and_value table of
4 hashtables, even tho they're "hidden" (bug#5082).
5
12009-11-29 Jan Djärv <jan.h.d@swipnet.se> 62009-11-29 Jan Djärv <jan.h.d@swipnet.se>
2 7
3 * frame.c (frame_make_pointer_invisible) 8 * frame.c (frame_make_pointer_invisible)
@@ -16,7 +21,7 @@
16 * xterm.c (x_delete_terminal): Set dpyinfo->display to NULL. 21 * xterm.c (x_delete_terminal): Set dpyinfo->display to NULL.
17 22
18 * frame.c (frame_make_pointer_invisible) 23 * frame.c (frame_make_pointer_invisible)
19 (frame_make_pointer_visible): Just return if there isn't any selected 24 (frame_make_pointer_visible): Just return if there isn't any selected
20 frame. 25 frame.
21 26
22 * search.c (simple_search): Remove warning by making *p const. 27 * search.c (simple_search): Remove warning by making *p const.
diff --git a/src/print.c b/src/print.c
index a011cb885fa..764572fedfc 100644
--- a/src/print.c
+++ b/src/print.c
@@ -1416,6 +1416,13 @@ print_preprocess (obj)
1416 size &= PSEUDOVECTOR_SIZE_MASK; 1416 size &= PSEUDOVECTOR_SIZE_MASK;
1417 for (i = 0; i < size; i++) 1417 for (i = 0; i < size; i++)
1418 print_preprocess (XVECTOR (obj)->contents[i]); 1418 print_preprocess (XVECTOR (obj)->contents[i]);
1419 if (HASH_TABLE_P (obj))
1420 { /* For hash tables, the key_and_value slot is past
1421 `size' because it needs to be marked specially in case
1422 the table is weak. */
1423 struct Lisp_Hash_Table *h = XHASH_TABLE (obj);
1424 print_preprocess (h->key_and_value);
1425 }
1419 break; 1426 break;
1420 1427
1421 default: 1428 default: