From: Richard M. Stallman <rms@gnu.org>
Date: Thu, 25 Apr 1996 03:36:01 +0000 (+0000)
Subject: (Fx_list_fonts) [BROKEN_XLISTFONTSWITHINFO]:
X-Git-Tag: emacs-19.34~790
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=e74c43500e257f0bea26b5edd17bcf8d5fb85a62;p=emacs.git

(Fx_list_fonts) [BROKEN_XLISTFONTSWITHINFO]:
Free the font, and the fontinfo too if we don't want it.
---

diff --git a/src/xfns.c b/src/xfns.c
index 36d164a45c8..a141c694767 100644
--- a/src/xfns.c
+++ b/src/xfns.c
@@ -3480,6 +3480,12 @@ even if they match PATTERN and FACE.")
 	      UNBLOCK_INPUT;
 
 	      keeper = thisinfo && same_size_fonts (thisinfo, size_ref);
+	      BLOCK_INPUT;
+	      if (thisinfo && ! keeper)
+		XFreeFont (FRAME_X_DISPLAY (f), thisinfo);
+	      else if (thisinfo)
+		XFreeFontInfo (NULL, thisinfo, 1);
+	      UNBLOCK_INPUT;
 #else
 	      keeper = same_size_fonts (&info[i], size_ref);
 #endif