aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorPaul Eggert2011-03-08 23:02:55 -0800
committerPaul Eggert2011-03-08 23:02:55 -0800
commitcdf4ba58eb200f81447bedabab41eeb84549061b (patch)
treee1e18f1611658fb45bbde6169cb73dbdee3a1d12 /src
parente2b134730c43a1c4b9a20b0df859a84dbb26669c (diff)
downloademacs-cdf4ba58eb200f81447bedabab41eeb84549061b.tar.gz
emacs-cdf4ba58eb200f81447bedabab41eeb84549061b.zip
* xterm.c: (x_shift_glyphs_for_insert, XTflash, XTring_bell):
(x_calc_absolute_position): Now static.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog2
-rw-r--r--src/xterm.c8
2 files changed, 6 insertions, 4 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 667a7ba2b15..dd88e961a51 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -4,6 +4,8 @@
4 4
5 * xterm.c (x_copy_dpy_color, x_focus_on_frame, x_unfocus_frame): 5 * xterm.c (x_copy_dpy_color, x_focus_on_frame, x_unfocus_frame):
6 Remove unused functions. 6 Remove unused functions.
7 (x_shift_glyphs_for_insert, XTflash, XTring_bell):
8 (x_calc_absolute_position): Now static.
7 9
8 * xfaces.c (clear_face_cache, Fx_list_fonts, Fface_font): Rename 10 * xfaces.c (clear_face_cache, Fx_list_fonts, Fface_font): Rename
9 or move locals to avoid shadowing. 11 or move locals to avoid shadowing.
diff --git a/src/xterm.c b/src/xterm.c
index 49553e3f1e0..beb215b5680 100644
--- a/src/xterm.c
+++ b/src/xterm.c
@@ -2886,7 +2886,7 @@ x_draw_glyph_string (struct glyph_string *s)
2886 2886
2887/* Shift display to make room for inserted glyphs. */ 2887/* Shift display to make room for inserted glyphs. */
2888 2888
2889void 2889static void
2890x_shift_glyphs_for_insert (struct frame *f, int x, int y, int width, int height, int shift_by) 2890x_shift_glyphs_for_insert (struct frame *f, int x, int y, int width, int height, int shift_by)
2891{ 2891{
2892 XCopyArea (FRAME_X_DISPLAY (f), FRAME_X_WINDOW (f), FRAME_X_WINDOW (f), 2892 XCopyArea (FRAME_X_DISPLAY (f), FRAME_X_WINDOW (f), FRAME_X_WINDOW (f),
@@ -2990,7 +2990,7 @@ timeval_subtract (struct timeval *result, struct timeval x, struct timeval y)
2990 return x.tv_sec < y.tv_sec; 2990 return x.tv_sec < y.tv_sec;
2991} 2991}
2992 2992
2993void 2993static void
2994XTflash (struct frame *f) 2994XTflash (struct frame *f)
2995{ 2995{
2996 BLOCK_INPUT; 2996 BLOCK_INPUT;
@@ -3165,7 +3165,7 @@ XTtoggle_invisible_pointer (FRAME_PTR f, int invisible)
3165 3165
3166/* Make audible bell. */ 3166/* Make audible bell. */
3167 3167
3168void 3168static void
3169XTring_bell (struct frame *f) 3169XTring_bell (struct frame *f)
3170{ 3170{
3171 if (FRAME_X_DISPLAY (f)) 3171 if (FRAME_X_DISPLAY (f))
@@ -8098,7 +8098,7 @@ xim_close_dpy (struct x_display_info *dpyinfo)
8098/* Calculate the absolute position in frame F 8098/* Calculate the absolute position in frame F
8099 from its current recorded position values and gravity. */ 8099 from its current recorded position values and gravity. */
8100 8100
8101void 8101static void
8102x_calc_absolute_position (struct frame *f) 8102x_calc_absolute_position (struct frame *f)
8103{ 8103{
8104 int flags = f->size_hint_flags; 8104 int flags = f->size_hint_flags;