diff options
author | Dmitry Antipov <dmantipov@yandex.ru> | 2013-08-13 18:45:58 +0400 |
---|---|---|
committer | Dmitry Antipov <dmantipov@yandex.ru> | 2013-08-13 18:45:58 +0400 |
commit | eeaf9bf3377b6d4b9083159726da8bb67b36cb56 (patch) | |
tree | 1fe61fad7218d96666305a07a681a7c33c296c49 /src/fringe.c | |
parent | f73f4ce69f4b2e8f6c422aca8f8cc36ef72fa725 (diff) | |
download | emacs-eeaf9bf3377b6d4b9083159726da8bb67b36cb56.tar.gz |
* window.h (struct window): Convert left_margin_cols and
right_margin_cols from Lisp_Objects to integers. Adjust comment.
(WINDOW_LEFT_MARGIN_COLS, WINDOW_RIGHT_MARGIN_COLS)
(WINDOW_LEFT_MARGIN_WIDTH, WINDOW_RIGHT_MARGIN_WIDTH):
Adjust users.
* dispnew.c (margin_glyphs_to_reserve): Convert 3rd arg to int.
Adjust comment.
(showing_window_margins_p, update_window_line, update_frame_1):
* fringe.c (draw_fringe_bitmap_1):
* xdisp.c (window_box_width): Adjust users.
* window.c (wset_left_margin_cols, wset_right_margin_cols): Remove.
(adjust_window_margins, set_window_buffer, Fsplit_window_internal):
Use direct assignment.
(Fset_window_configuration, save_window_save, Fwindow_margins):
Convert Lisp_Object to integer and back where appropriate.
(Fset_window_margins): Adjust user. Return t if any margin
was actually changed, and mention this in docstring.
Diffstat (limited to 'src/fringe.c')
-rw-r--r-- | src/fringe.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/fringe.c b/src/fringe.c index 1d05244e64e..492eddae8d4 100644 --- a/src/fringe.c +++ b/src/fringe.c @@ -666,7 +666,7 @@ draw_fringe_bitmap_1 (struct window *w, struct glyph_row *row, int left_p, int o and OTOH leaving out that one pixel leaves behind traces of the cursor, if it was in column zero before drawing non-empty margin area. */ - && NILP (w->left_margin_cols)) + && w->left_margin_cols == 0) ? 1 : 0); p.bx = x - wd; p.nx = wd; |