# HG changeset patch
# User Andreas Schwab <schwab@linux-m68k.org>
# Date 1258485194 0
# Node ID 58fd09a16d9eca193207128c1c6d83f23f93879c
# Parent  32eb9a99172593543bc335df9356c521d514fd6e
(x_default_font_parameter): Remove dead assignment.

diff -r 32eb9a991725 -r 58fd09a16d9e src/ChangeLog
--- a/src/ChangeLog	Tue Nov 17 19:11:53 2009 +0000
+++ b/src/ChangeLog	Tue Nov 17 19:13:14 2009 +0000
@@ -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 -r 32eb9a991725 -r 58fd09a16d9e src/xfns.c
--- a/src/xfns.c	Tue Nov 17 19:11:53 2009 +0000
+++ b/src/xfns.c	Tue Nov 17 19:13:14 2009 +0000
@@ -3032,7 +3032,6 @@
   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);
     }