aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorPaul Eggert2011-03-08 23:11:42 -0800
committerPaul Eggert2011-03-08 23:11:42 -0800
commited7bf3a5ee1e31dafbb2d285b39c8fe07fc06f7c (patch)
tree4e03e0c36d24dbecb80330bfadc376b97a99ce53 /src
parent2b07bcffb0e2b6cef517406cbc979ac14e46cd8e (diff)
downloademacs-ed7bf3a5ee1e31dafbb2d285b39c8fe07fc06f7c.tar.gz
emacs-ed7bf3a5ee1e31dafbb2d285b39c8fe07fc06f7c.zip
* xterm.c (x_iconify_frame, x_free_frame_resources): Don't declare locals
unless they are used.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog2
-rw-r--r--src/xterm.c6
2 files changed, 7 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 7f9e68e71e5..0a14f36dbe7 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -8,6 +8,8 @@
8 (x_calc_absolute_position): Now static. 8 (x_calc_absolute_position): Now static.
9 (XTread_socket): Don't define label "out" unless it's used. 9 (XTread_socket): Don't define label "out" unless it's used.
10 Don't declare local "event" unless it's used. 10 Don't declare local "event" unless it's used.
11 (x_iconify_frame, x_free_frame_resources): Don't declare locals
12 unless they are used.
11 13
12 * xfaces.c (clear_face_cache, Fx_list_fonts, Fface_font): Rename 14 * xfaces.c (clear_face_cache, Fx_list_fonts, Fface_font): Rename
13 or move locals to avoid shadowing. 15 or move locals to avoid shadowing.
diff --git a/src/xterm.c b/src/xterm.c
index f253ed0aa3f..9220d84815c 100644
--- a/src/xterm.c
+++ b/src/xterm.c
@@ -9166,7 +9166,9 @@ x_make_frame_invisible (struct frame *f)
9166void 9166void
9167x_iconify_frame (struct frame *f) 9167x_iconify_frame (struct frame *f)
9168{ 9168{
9169#ifdef USE_X_TOOLKIT
9169 int result; 9170 int result;
9171#endif
9170 Lisp_Object type; 9172 Lisp_Object type;
9171 9173
9172 /* Don't keep the highlight on an invisible frame. */ 9174 /* Don't keep the highlight on an invisible frame. */
@@ -9293,9 +9295,11 @@ void
9293x_free_frame_resources (struct frame *f) 9295x_free_frame_resources (struct frame *f)
9294{ 9296{
9295 struct x_display_info *dpyinfo = FRAME_X_DISPLAY_INFO (f); 9297 struct x_display_info *dpyinfo = FRAME_X_DISPLAY_INFO (f);
9298 Mouse_HLInfo *hlinfo = &dpyinfo->mouse_highlight;
9299#ifdef USE_X_TOOLKIT
9296 Lisp_Object bar; 9300 Lisp_Object bar;
9297 struct scroll_bar *b; 9301 struct scroll_bar *b;
9298 Mouse_HLInfo *hlinfo = &dpyinfo->mouse_highlight; 9302#endif
9299 9303
9300 BLOCK_INPUT; 9304 BLOCK_INPUT;
9301 9305