diff options
| author | Dmitry Antipov | 2012-06-29 15:48:08 +0400 |
|---|---|---|
| committer | Dmitry Antipov | 2012-06-29 15:48:08 +0400 |
| commit | 2af3565e0f2b325924e4adad26a08b442fa022ac (patch) | |
| tree | 2786dc842d627cd1a847935c8cbad36896592792 /src/window.h | |
| parent | e4d3503065a43300417cdb6563c23d0d6beedbb7 (diff) | |
| download | emacs-2af3565e0f2b325924e4adad26a08b442fa022ac.tar.gz emacs-2af3565e0f2b325924e4adad26a08b442fa022ac.zip | |
* 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 50bd7134f27..34b5bb7a0dd 100644 --- a/src/window.h +++ b/src/window.h | |||
| @@ -159,9 +159,6 @@ struct window | |||
| 159 | /* Width of left and right fringes. | 159 | /* Width of left and right fringes. |
| 160 | A value of nil or t means use frame values. */ | 160 | A value of nil or t means use frame values. */ |
| 161 | Lisp_Object left_fringe_width, right_fringe_width; | 161 | Lisp_Object left_fringe_width, right_fringe_width; |
| 162 | /* Non-nil means fringes are drawn outside display margins; | ||
| 163 | othersize draw them between margin areas and text. */ | ||
| 164 | Lisp_Object fringes_outside_margins; | ||
| 165 | 162 | ||
| 166 | /* Pixel width of scroll bars. | 163 | /* Pixel width of scroll bars. |
| 167 | A value of nil or t means use frame values. */ | 164 | A value of nil or t means use frame values. */ |
| @@ -330,13 +327,17 @@ struct window | |||
| 330 | accept that. */ | 327 | accept that. */ |
| 331 | unsigned frozen_window_start_p : 1; | 328 | unsigned frozen_window_start_p : 1; |
| 332 | 329 | ||
| 330 | /* Non-zero means fringes are drawn outside display margins. | ||
| 331 | Otherwise draw them between margin areas and text. */ | ||
| 332 | unsigned fringes_outside_margins : 1; | ||
| 333 | |||
| 333 | /* Amount by which lines of this window are scrolled in | 334 | /* Amount by which lines of this window are scrolled in |
| 334 | y-direction (smooth scrolling). */ | 335 | y-direction (smooth scrolling). */ |
| 335 | int vscroll; | 336 | int vscroll; |
| 336 | 337 | ||
| 337 | /* Z_BYTE - the buffer position of the last glyph in the current matrix | 338 | /* Z_BYTE - the buffer position of the last glyph in the current matrix of W. |
| 338 | of W. Only valid if WINDOW_END_VALID is not nil. */ | 339 | Should be nonnegative, and only valid if window_end_valid is not nil. */ |
| 339 | int window_end_bytepos; | 340 | ptrdiff_t window_end_bytepos; |
| 340 | }; | 341 | }; |
| 341 | 342 | ||
| 342 | /* 1 if W is a minibuffer window. */ | 343 | /* 1 if W is a minibuffer window. */ |
| @@ -612,7 +613,7 @@ struct window | |||
| 612 | /* Are fringes outside display margins in window W. */ | 613 | /* Are fringes outside display margins in window W. */ |
| 613 | 614 | ||
| 614 | #define WINDOW_HAS_FRINGES_OUTSIDE_MARGINS(W) \ | 615 | #define WINDOW_HAS_FRINGES_OUTSIDE_MARGINS(W) \ |
| 615 | (!NILP ((W)->fringes_outside_margins)) | 616 | ((W)->fringes_outside_margins) |
| 616 | 617 | ||
| 617 | /* Say whether scroll bars are currently enabled for window W, | 618 | /* Say whether scroll bars are currently enabled for window W, |
| 618 | and which side they are on. */ | 619 | and which side they are on. */ |