Mercurial > emacs

changeset 106096:58fd09a16d9e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(x_default_font_parameter): Remove dead assignment.
author Andreas Schwab <schwab@linux-m68k.org>
date Tue, 17 Nov 2009 19:13:14 +0000
parents 32eb9a991725
children 5fa329215a93
files src/ChangeLog src/xfns.c
diffstat 2 files changed, 2 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- 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>
--- 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);
     }