aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorStefan Monnier2005-09-01 14:16:19 +0000
committerStefan Monnier2005-09-01 14:16:19 +0000
commit82f4a138a7ece82dfe955da9d8443c7f6dbc47e0 (patch)
tree34f84ed8f346cb12939f4d6f4d7c02aca727fff4 /src
parenta9efeb1df80145553d3c0c6c8da51a8dae2fd8dc (diff)
downloademacs-82f4a138a7ece82dfe955da9d8443c7f6dbc47e0.tar.gz
emacs-82f4a138a7ece82dfe955da9d8443c7f6dbc47e0.zip
(window_to_frame_hpos, update_window):
Avoid gcc warning about unused variable `f'.
Diffstat (limited to 'src')
-rw-r--r--src/dispnew.c8
1 files changed, 2 insertions, 6 deletions
diff --git a/src/dispnew.c b/src/dispnew.c
index 15190abfb7e..3975f9ad788 100644
--- a/src/dispnew.c
+++ b/src/dispnew.c
@@ -3324,9 +3324,7 @@ window_to_frame_hpos (w, hpos)
3324 struct window *w; 3324 struct window *w;
3325 int hpos; 3325 int hpos;
3326{ 3326{
3327 struct frame *f = XFRAME (w->frame); 3327 xassert (!FRAME_WINDOW_P (XFRAME (w->frame)));
3328
3329 xassert (!FRAME_WINDOW_P (f));
3330 hpos += WINDOW_LEFT_EDGE_COL (w); 3328 hpos += WINDOW_LEFT_EDGE_COL (w);
3331 return hpos; 3329 return hpos;
3332} 3330}
@@ -4101,10 +4099,8 @@ update_window (w, force_p)
4101 extern int input_pending; 4099 extern int input_pending;
4102 extern Lisp_Object do_mouse_tracking; 4100 extern Lisp_Object do_mouse_tracking;
4103#if GLYPH_DEBUG 4101#if GLYPH_DEBUG
4104 struct frame *f = XFRAME (WINDOW_FRAME (w));
4105
4106 /* Check that W's frame doesn't have glyph matrices. */ 4102 /* Check that W's frame doesn't have glyph matrices. */
4107 xassert (FRAME_WINDOW_P (f)); 4103 xassert (FRAME_WINDOW_P (XFRAME (WINDOW_FRAME (w))));
4108 xassert (updating_frame != NULL); 4104 xassert (updating_frame != NULL);
4109#endif 4105#endif
4110 4106