aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog4
-rw-r--r--src/font.c1
2 files changed, 5 insertions, 0 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 62782e63eef..2caec5e5d11 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
12011-01-27 Chong Yidong <cyd@stupidchicken.com>
2
3 * font.c (font_parse_fcname): Undefine a temporary macro.
4
12011-01-26 Stefan Monnier <monnier@iro.umontreal.ca> 52011-01-26 Stefan Monnier <monnier@iro.umontreal.ca>
2 6
3 Let the debugger continue to the normal handler (bug#7825). 7 Let the debugger continue to the normal handler (bug#7825).
diff --git a/src/font.c b/src/font.c
index 52b239569bd..449169dad1b 100644
--- a/src/font.c
+++ b/src/font.c
@@ -1513,6 +1513,7 @@ font_parse_fcname (char *name, Lisp_Object font)
1513 } 1513 }
1514 } 1514 }
1515#undef PROP_MATCH 1515#undef PROP_MATCH
1516#undef PROP_SAVE
1516 1517
1517 if (family_end) 1518 if (family_end)
1518 ASET (font, FONT_FAMILY_INDEX, 1519 ASET (font, FONT_FAMILY_INDEX,