diff options
| author | Dmitry Antipov <[email protected]> | 2012-06-29 15:48:08 +0400 |
|---|---|---|
| committer | Dmitry Antipov <[email protected]> | 2012-06-29 15:48:08 +0400 |
| commit | 2af3565e0f2b325924e4adad26a08b442fa022ac (patch) | |
| tree | 2786dc842d627cd1a847935c8cbad36896592792 /src/window.h | |
| parent | e4d3503065a43300417cdb6563c23d0d6beedbb7 (diff) | |
* lisp/fringe.el (fringe-mode): Doc fix.
* src/window.h (struct window): Change type of 'fringes_outside_margins'
to bitfield. Fix comment. Adjust users accordingly.
(struct window): Change type of 'window_end_bytepos' to ptrdiff_t.
Adjust comment.
* src/xdisp.c (try_window_id): Change type of 'first_vpos' and 'vpos'
to ptrdiff_t.
Diffstat (limited to 'src/window.h')
| -rw-r--r-- | src/window.h | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/src/window.h b/src/window.h index 50bd7134f2..34b5bb7a0d 100644 --- a/src/window.h +++ b/src/window.h @@ -159,9 +159,6 @@ struct window /* Width of left and right fringes. A value of nil or t means use frame values. */ Lisp_Object left_fringe_width, right_fringe_width; - /* Non-nil means fringes are drawn outside display margins; - othersize draw them between margin areas and text. */ - Lisp_Object fringes_outside_margins; /* Pixel width of scroll bars. A value of nil or t means use frame values. */ @@ -330,13 +327,17 @@ struct window accept that. */ unsigned frozen_window_start_p : 1; + /* Non-zero means fringes are drawn outside display margins. + Otherwise draw them between margin areas and text. */ + unsigned fringes_outside_margins : 1; + /* Amount by which lines of this window are scrolled in y-direction (smooth scrolling). */ int vscroll; - /* Z_BYTE - the buffer position of the last glyph in the current matrix - of W. Only valid if WINDOW_END_VALID is not nil. */ - int window_end_bytepos; + /* Z_BYTE - the buffer position of the last glyph in the current matrix of W. + Should be nonnegative, and only valid if window_end_valid is not nil. */ + ptrdiff_t window_end_bytepos; }; /* 1 if W is a minibuffer window. */ @@ -612,7 +613,7 @@ struct window /* Are fringes outside display margins in window W. */ #define WINDOW_HAS_FRINGES_OUTSIDE_MARGINS(W) \ - (!NILP ((W)->fringes_outside_margins)) + ((W)->fringes_outside_margins) /* Say whether scroll bars are currently enabled for window W, and which side they are on. */ |