diff options
| author | Dmitry Antipov <dmantipov@yandex.ru> | 2013-03-20 15:29:37 +0400 |
|---|---|---|
| committer | Dmitry Antipov <dmantipov@yandex.ru> | 2013-03-20 15:29:37 +0400 |
| commit | 5f24fa51a07664e81d4c710fe310d2c2fbea8bb5 (patch) | |
| tree | 4d5681a0ae85865f263f6a29ea41dcf3e4ed41e8 /src/dispnew.c | |
| parent | 96061a21804d6f7ac3b1371470a288344f5f62cd (diff) | |
| download | emacs-5f24fa51a07664e81d4c710fe310d2c2fbea8bb5.tar.gz | |
* window.h (struct window): Convert left_col, top_line, total_lines
and total_cols from Lisp_Objects to integers. Adjust comments.
(wset_left_col, wset_top_line, wset_total_cols, wset_total_lines):
Remove.
(WINDOW_TOTAL_COLS, WINDOW_TOTAL_LINES, WINDOW_LEFT_EDGE_COL)
(WINDOW_TOP_EDGE_LINE): Drop Lisp_Object to integer conversion.
* dispnew.c, frame.c, w32fns.c, window.c, xdisp.c, xfns.c:
Adjust users where appropriate.
Diffstat (limited to 'src/dispnew.c')
| -rw-r--r-- | src/dispnew.c | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/src/dispnew.c b/src/dispnew.c index f23562cb97a..bc65050605a 100644 --- a/src/dispnew.c +++ b/src/dispnew.c @@ -363,7 +363,7 @@ margin_glyphs_to_reserve (struct window *w, int total_glyphs, Lisp_Object margin if (NUMBERP (margin)) { - int width = XFASTINT (w->total_cols); + int width = w->total_cols; double d = max (0, XFLOATINT (margin)); d = min (width / 2 - 1, d); n = (int) ((double) total_glyphs / width * d); @@ -1776,7 +1776,7 @@ required_matrix_width (struct window *w) } #endif /* HAVE_WINDOW_SYSTEM */ - return XINT (w->total_cols); + return w->total_cols; } @@ -2114,10 +2114,10 @@ adjust_frame_glyphs_for_window_redisplay (struct frame *f) /* Set window dimensions to frame dimensions and allocate or adjust glyph matrices of W. */ - wset_top_line (w, make_number (0)); - wset_left_col (w, make_number (0)); - wset_total_lines (w, make_number (FRAME_MENU_BAR_LINES (f))); - wset_total_cols (w, make_number (FRAME_TOTAL_COLS (f))); + w->top_line = 0; + w->left_col = 0; + w->total_lines = FRAME_MENU_BAR_LINES (f); + w->total_cols = FRAME_TOTAL_COLS (f); allocate_matrices_for_window_redisplay (w); } #endif /* not USE_X_TOOLKIT && not USE_GTK */ @@ -2140,10 +2140,10 @@ adjust_frame_glyphs_for_window_redisplay (struct frame *f) else w = XWINDOW (f->tool_bar_window); - wset_top_line (w, make_number (FRAME_MENU_BAR_LINES (f))); - wset_left_col (w, make_number (0)); - wset_total_lines (w, make_number (FRAME_TOOL_BAR_LINES (f))); - wset_total_cols (w, make_number (FRAME_TOTAL_COLS (f))); + w->top_line = FRAME_MENU_BAR_LINES (f); + w->left_col = 0; + w->total_lines = FRAME_TOOL_BAR_LINES (f); + w->total_cols = FRAME_TOTAL_COLS (f); allocate_matrices_for_window_redisplay (w); } #endif @@ -5583,7 +5583,7 @@ change_frame_size_1 (struct frame *f, int newheight, int newwidth, FrameCols (FRAME_TTY (f)) = newwidth; if (WINDOWP (f->tool_bar_window)) - wset_total_cols (XWINDOW (f->tool_bar_window), make_number (newwidth)); + XWINDOW (f->tool_bar_window)->total_cols = newwidth; } FRAME_LINES (f) = newheight; |