aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorAndreas Schwab2010-12-03 11:07:40 +0100
committerAndreas Schwab2010-12-03 11:07:40 +0100
commitbabc8f0d4a6b1fc24b1fe3fc10a833eb3e694906 (patch)
tree9abdbb8da1b031120a8226ffd431ca60cdba41ba /src
parent665ca1eef653901f0f4b28862c89dc6dad8619b9 (diff)
downloademacs-babc8f0d4a6b1fc24b1fe3fc10a833eb3e694906.tar.gz
emacs-babc8f0d4a6b1fc24b1fe3fc10a833eb3e694906.zip
* frame.c (x_set_font): Remove unused variable.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog4
-rw-r--r--src/frame.c2
2 files changed, 5 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index dc6a02d7faf..ccc3e480eb9 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
12010-12-03 Andreas Schwab <schwab@linux-m68k.org>
2
3 * frame.c (x_set_font): Remove unused variable.
4
12010-12-02 Jan Djärv <jan.h.d@swipnet.se> 52010-12-02 Jan Djärv <jan.h.d@swipnet.se>
2 6
3 * nsmenu.m (update_frame_tool_bar): Remove NSLog on invalid image. 7 * nsmenu.m (update_frame_tool_bar): Remove NSLog on invalid image.
diff --git a/src/frame.c b/src/frame.c
index ba675be5b5f..6cf46f1a0ba 100644
--- a/src/frame.c
+++ b/src/frame.c
@@ -3311,7 +3311,7 @@ x_set_screen_gamma (struct frame *f, Lisp_Object new_value, Lisp_Object old_valu
3311void 3311void
3312x_set_font (struct frame *f, Lisp_Object arg, Lisp_Object oldval) 3312x_set_font (struct frame *f, Lisp_Object arg, Lisp_Object oldval)
3313{ 3313{
3314 Lisp_Object frame, font_object, font_param = Qnil; 3314 Lisp_Object font_object, font_param = Qnil;
3315 int fontset = -1; 3315 int fontset = -1;
3316 3316
3317 /* Set the frame parameter back to the old value because we may 3317 /* Set the frame parameter back to the old value because we may