From: Andreas Schwab <schwab@linux-m68k.org>
Date: Tue, 17 Nov 2009 19:13:14 +0000 (+0000)
Subject: (x_default_font_parameter): Remove dead assignment.
X-Git-Tag: emacs-pretest-23.1.90~366
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=25fe851a7c3c37ba537e5c08af2b0396ccb5ad60;p=emacs.git

(x_default_font_parameter): Remove dead assignment.
---

diff --git a/src/ChangeLog b/src/ChangeLog
index c842a1c0306..ef97e097bf0 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,7 @@
 2009-11-17  Andreas Schwab  <schwab@linux-m68k.org>
 
+	* xfns.c (x_default_font_parameter): Remove dead assignment.
+
 	* lisp.h (Fbyteorder, init_font, Ffont_get_system_font): Declare.
 
 2009-11-17  Jan Djärv  <jan.h.d@swipnet.se>
diff --git a/src/xfns.c b/src/xfns.c
index 3d5a2a127d6..2350fbfa9a4 100644
--- a/src/xfns.c
+++ b/src/xfns.c
@@ -3032,7 +3032,6 @@ x_default_font_parameter (f, parms)
   int got_from_gconf = 0;
   if (EQ (font_param, Qunbound))
     {
-      font_param = Qnil;
       font_param = Ffont_get_system_font();
       got_from_gconf = !NILP (font_param);
     }