aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorPaul Eggert2011-03-08 23:05:07 -0800
committerPaul Eggert2011-03-08 23:05:07 -0800
commit7411c6867f74428cf2441cb2b1bd5100185b9a03 (patch)
treed3a364870f965026bd35494abb0ce10403edaacd /src
parentcdf4ba58eb200f81447bedabab41eeb84549061b (diff)
downloademacs-7411c6867f74428cf2441cb2b1bd5100185b9a03.tar.gz
emacs-7411c6867f74428cf2441cb2b1bd5100185b9a03.zip
* xterm.c (XTread_socket): Don't define label "out" unless it's used.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog1
-rw-r--r--src/xterm.c4
2 files changed, 3 insertions, 2 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index dd88e961a51..f0c1db2ab73 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -6,6 +6,7 @@
6 Remove unused functions. 6 Remove unused functions.
7 (x_shift_glyphs_for_insert, XTflash, XTring_bell): 7 (x_shift_glyphs_for_insert, XTflash, XTring_bell):
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 10
10 * xfaces.c (clear_face_cache, Fx_list_fonts, Fface_font): Rename 11 * xfaces.c (clear_face_cache, Fx_list_fonts, Fface_font): Rename
11 or move locals to avoid shadowing. 12 or move locals to avoid shadowing.
diff --git a/src/xterm.c b/src/xterm.c
index beb215b5680..4c7fc1b9b1e 100644
--- a/src/xterm.c
+++ b/src/xterm.c
@@ -7042,6 +7042,8 @@ XTread_socket (struct terminal *terminal, int expected, struct input_event *hold
7042 goto out; 7042 goto out;
7043 } 7043 }
7044 7044
7045 out:;
7046
7045#else /* USE_GTK */ 7047#else /* USE_GTK */
7046 7048
7047 /* For GTK we must use the GTK event loop. But XEvents gets passed 7049 /* For GTK we must use the GTK event loop. But XEvents gets passed
@@ -7068,8 +7070,6 @@ XTread_socket (struct terminal *terminal, int expected, struct input_event *hold
7068 } 7070 }
7069#endif /* USE_GTK */ 7071#endif /* USE_GTK */
7070 7072
7071 out:;
7072
7073 /* On some systems, an X bug causes Emacs to get no more events 7073 /* On some systems, an X bug causes Emacs to get no more events
7074 when the window is destroyed. Detect that. (1994.) */ 7074 when the window is destroyed. Detect that. (1994.) */
7075 if (! event_found) 7075 if (! event_found)