Merged in changes from CVS trunk.

[gnu-emacs] / src / window.h

diff --git a/src/window.h b/src/window.h
index 1e53ae659cb802a6b7df23050bbe2382190c97c8..8df0b6bb3ebe765222e55b8b2d0c864d9335721b 100644 (file)
--- a/src/window.h
+++ b/src/window.h
@@ -236,6 +236,11 @@ struct window
     struct glyph_matrix *current_matrix;
     struct glyph_matrix *desired_matrix;
 
+    /* Scaling factor for the glyph_matrix size calculation in this window.
+       Used if window contains many small images or uses proportional fonts,
+       as the normal  may yield a matrix which is too small.  */
+    int nrows_scale_factor, ncols_scale_factor;
+
     /* Cursor position as of last update that completed without
        pause.  This is the position of last_point.  */
     struct cursor_pos last_cursor;
@@ -747,7 +752,7 @@ extern Lisp_Object Vminibuf_scroll_window;
 /* Nil or a symbol naming the window system under which emacs is
    running ('x is the only current possibility) */
 
-extern Lisp_Object Vwindow_system;
+extern Lisp_Object Vinitial_window_system;
 
 /* Version number of X windows: 10, 11 or nil.  */