Mercurial > emacs
comparison src/xsettings.c @ 108068:c15cb68e177f
Fix Bug#6001.
* xsettings.c (read_and_apply_settings): Check if current_font is
NULL before strcmp (Bug#6001).
| author | Jan D. <jan.h.d@swipnet.se> |
|---|---|
| date | Thu, 22 Apr 2010 19:23:18 +0200 |
| parents | c10fc3731b2c |
| children | c9cc3dd13301 |
comparison
equal
deleted
inserted
replaced
| 108067:b0957e256d91 | 108068:c15cb68e177f |
|---|---|
| 576 free (settings.tb_style); | 576 free (settings.tb_style); |
| 577 } | 577 } |
| 578 | 578 |
| 579 if (settings.seen & SEEN_FONT) | 579 if (settings.seen & SEEN_FONT) |
| 580 { | 580 { |
| 581 if (strcmp (current_font, settings.font) != 0) | 581 if (!current_font || strcmp (current_font, settings.font) != 0) |
| 582 { | 582 { |
| 583 free (current_font); | 583 free (current_font); |
| 584 current_font = settings.font; | 584 current_font = settings.font; |
| 585 if (send_event_p) | 585 if (send_event_p) |
| 586 store_config_changed_event (Qfont_name, dpyname); | 586 store_config_changed_event (Qfont_name, dpyname); |