From: Stefan Monnier <monnier@iro.umontreal.ca>
Date: Thu, 1 Sep 2005 14:16:19 +0000 (+0000)
Subject: (window_to_frame_hpos, update_window):
X-Git-Tag: emacs-pretest-22.0.90~7282
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=82f4a138a7ece82dfe955da9d8443c7f6dbc47e0;p=emacs.git

(window_to_frame_hpos, update_window):
Avoid gcc warning about unused variable `f'.
---

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)
      struct window *w;
      int hpos;
 {
-  struct frame *f = XFRAME (w->frame);
-
-  xassert (!FRAME_WINDOW_P (f));
+  xassert (!FRAME_WINDOW_P (XFRAME (w->frame)));
   hpos += WINDOW_LEFT_EDGE_COL (w);
   return hpos;
 }
@@ -4101,10 +4099,8 @@ update_window (w, force_p)
   extern int input_pending;
   extern Lisp_Object do_mouse_tracking;
 #if GLYPH_DEBUG
-  struct frame *f = XFRAME (WINDOW_FRAME (w));
-
   /* Check that W's frame doesn't have glyph matrices.  */
-  xassert (FRAME_WINDOW_P (f));
+  xassert (FRAME_WINDOW_P (XFRAME (WINDOW_FRAME (w))));
   xassert (updating_frame != NULL);
 #endif