diff options
| author | Andreas Schwab | 2009-11-17 19:13:14 +0000 |
|---|---|---|
| committer | Andreas Schwab | 2009-11-17 19:13:14 +0000 |
| commit | 25fe851a7c3c37ba537e5c08af2b0396ccb5ad60 (patch) | |
| tree | 9b6b00e31c9fc4626aa1538661d39e46c6b87171 /src | |
| parent | 9370c1d8eb0cc7541f42bca91bf54de0052d4a81 (diff) | |
| download | emacs-25fe851a7c3c37ba537e5c08af2b0396ccb5ad60.tar.gz emacs-25fe851a7c3c37ba537e5c08af2b0396ccb5ad60.zip | |
(x_default_font_parameter): Remove dead assignment.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 2 | ||||
| -rw-r--r-- | src/xfns.c | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index c842a1c0306..ef97e097bf0 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,5 +1,7 @@ | |||
| 1 | 2009-11-17 Andreas Schwab <schwab@linux-m68k.org> | 1 | 2009-11-17 Andreas Schwab <schwab@linux-m68k.org> |
| 2 | 2 | ||
| 3 | * xfns.c (x_default_font_parameter): Remove dead assignment. | ||
| 4 | |||
| 3 | * lisp.h (Fbyteorder, init_font, Ffont_get_system_font): Declare. | 5 | * lisp.h (Fbyteorder, init_font, Ffont_get_system_font): Declare. |
| 4 | 6 | ||
| 5 | 2009-11-17 Jan Djärv <jan.h.d@swipnet.se> | 7 | 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) | |||
| 3032 | int got_from_gconf = 0; | 3032 | int got_from_gconf = 0; |
| 3033 | if (EQ (font_param, Qunbound)) | 3033 | if (EQ (font_param, Qunbound)) |
| 3034 | { | 3034 | { |
| 3035 | font_param = Qnil; | ||
| 3036 | font_param = Ffont_get_system_font(); | 3035 | font_param = Ffont_get_system_font(); |
| 3037 | got_from_gconf = !NILP (font_param); | 3036 | got_from_gconf = !NILP (font_param); |
| 3038 | } | 3037 | } |