[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/src/indent.c
From: |
Kim F. Storm |
Subject: |
[Emacs-diffs] Changes to emacs/src/indent.c |
Date: |
Sat, 24 May 2003 17:59:02 -0400 |
Index: emacs/src/indent.c
diff -c emacs/src/indent.c:1.155 emacs/src/indent.c:1.156
*** emacs/src/indent.c:1.155 Fri Nov 29 10:13:50 2002
--- emacs/src/indent.c Sat May 24 17:59:01 2003
***************
*** 1159,1176 ****
window_width - 1
- (has_vertical_scroll_bars
! ? FRAME_SCROLL_BAR_COLS (XFRAME (window->frame))
! : (window_width + window_left != frame_width))
where
! window_width is XFASTINT (w->width),
! window_left is XFASTINT (w->left),
has_vertical_scroll_bars is
! FRAME_HAS_VERTICAL_SCROLL_BARS (XFRAME (WINDOW_FRAME (window)))
! and frame_width = FRAME_WIDTH (XFRAME (window->frame))
! Or you can let window_internal_width do this all for you, and write:
! window_internal_width (w) - 1
The `-1' accounts for the continuation-line backslashes; the rest
accounts for window borders if the window is split horizontally, and
--- 1159,1176 ----
window_width - 1
- (has_vertical_scroll_bars
! ? WINDOW_CONFIG_SCROLL_BAR_COLS (window)
! : (window_width + window_left != frame_cols))
where
! window_width is XFASTINT (w->total_cols),
! window_left is XFASTINT (w->left_col),
has_vertical_scroll_bars is
! WINDOW_HAS_VERTICAL_SCROLL_BAR (window)
! and frame_cols = FRAME_COLS (XFRAME (window->frame))
! Or you can let window_box_text_cols do this all for you, and write:
! window_box_text_cols (w) - 1
The `-1' accounts for the continuation-line backslashes; the rest
accounts for window borders if the window is split horizontally, and
***************
*** 1366,1372 ****
{
if (hscroll
|| (truncate_partial_width_windows
! && width + 1 < FRAME_WIDTH (XFRAME (WINDOW_FRAME (win))))
|| !NILP (current_buffer->truncate_lines))
{
/* Truncating: skip to newline, unless we are already past
--- 1366,1372 ----
{
if (hscroll
|| (truncate_partial_width_windows
! && width + 1 < FRAME_COLS (XFRAME (WINDOW_FRAME (win))))
|| !NILP (current_buffer->truncate_lines))
{
/* Truncating: skip to newline, unless we are already past
***************
*** 1834,1840 ****
register int from, vtarget;
struct window *w;
{
! int width = window_internal_width (w) - 1;
int hscroll = XINT (w->hscroll);
struct position pos;
/* vpos is cumulative vertical position, changed as from is changed */
--- 1834,1842 ----
register int from, vtarget;
struct window *w;
{
! /* We don't need to make room for continuation marks (we have fringes now),
! so hould we really subtract 1 here if FRAME_WINDOW_P ? ++KFS */
! int width = window_box_text_cols (w) - 1;
int hscroll = XINT (w->hscroll);
struct position pos;
/* vpos is cumulative vertical position, changed as from is changed */
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] Changes to emacs/src/indent.c,
Kim F. Storm <=