diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2011-04-14 13:16:48 -0700 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2011-04-14 13:16:48 -0700 |
| commit | 8bd7b8304a41da5dc0c8a11967c1a6005e9465d0 (patch) | |
| tree | 145588110166df723c31f3fceaa00c190b77aa8c /src/xsettings.c | |
| parent | cd64ea1d0df393beb93d1bdf19bd3990e3378f85 (diff) | |
| parent | 9024ff7943e9529ec38a80aaaa0db43224c1e885 (diff) | |
| download | emacs-8bd7b8304a41da5dc0c8a11967c1a6005e9465d0.tar.gz emacs-8bd7b8304a41da5dc0c8a11967c1a6005e9465d0.tar.bz2 emacs-8bd7b8304a41da5dc0c8a11967c1a6005e9465d0.zip | |
Merge from mainline.
Diffstat (limited to 'src/xsettings.c')
| -rw-r--r-- | src/xsettings.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/xsettings.c b/src/xsettings.c index d09b702a428..2513bcc5aa8 100644 --- a/src/xsettings.c +++ b/src/xsettings.c @@ -566,20 +566,20 @@ read_and_apply_settings (struct x_display_info *dpyinfo, int send_event_p) if (send_event_p) store_config_changed_event (Qtool_bar_style, dpyname); } - free (settings.tb_style); + xfree (settings.tb_style); } if (settings.seen & SEEN_FONT) { if (!current_font || strcmp (current_font, settings.font) != 0) { - free (current_font); + xfree (current_font); current_font = settings.font; if (send_event_p) store_config_changed_event (Qfont_name, dpyname); } else - free (settings.font); + xfree (settings.font); } } |