aboutsummaryrefslogtreecommitdiffstats
path: root/src/window.c
diff options
context:
space:
mode:
authorDmitry Antipov2012-06-29 15:48:08 +0400
committerDmitry Antipov2012-06-29 15:48:08 +0400
commit2af3565e0f2b325924e4adad26a08b442fa022ac (patch)
tree2786dc842d627cd1a847935c8cbad36896592792 /src/window.c
parente4d3503065a43300417cdb6563c23d0d6beedbb7 (diff)
downloademacs-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.c')
-rw-r--r--src/window.c9
1 files changed, 5 insertions, 4 deletions
diff --git a/src/window.c b/src/window.c
index 9d78a3efa60..7691eb4dca9 100644
--- a/src/window.c
+++ b/src/window.c
@@ -5542,7 +5542,7 @@ the return value is nil. Otherwise the value is t. */)
5542 w->right_margin_cols = p->right_margin_cols; 5542 w->right_margin_cols = p->right_margin_cols;
5543 w->left_fringe_width = p->left_fringe_width; 5543 w->left_fringe_width = p->left_fringe_width;
5544 w->right_fringe_width = p->right_fringe_width; 5544 w->right_fringe_width = p->right_fringe_width;
5545 w->fringes_outside_margins = p->fringes_outside_margins; 5545 w->fringes_outside_margins = !NILP (p->fringes_outside_margins);
5546 w->scroll_bar_width = p->scroll_bar_width; 5546 w->scroll_bar_width = p->scroll_bar_width;
5547 w->vertical_scroll_bar_type = p->vertical_scroll_bar_type; 5547 w->vertical_scroll_bar_type = p->vertical_scroll_bar_type;
5548 w->dedicated = p->dedicated; 5548 w->dedicated = p->dedicated;
@@ -5858,7 +5858,7 @@ save_window_save (Lisp_Object window, struct Lisp_Vector *vector, int i)
5858 p->right_margin_cols = w->right_margin_cols; 5858 p->right_margin_cols = w->right_margin_cols;
5859 p->left_fringe_width = w->left_fringe_width; 5859 p->left_fringe_width = w->left_fringe_width;
5860 p->right_fringe_width = w->right_fringe_width; 5860 p->right_fringe_width = w->right_fringe_width;
5861 p->fringes_outside_margins = w->fringes_outside_margins; 5861 p->fringes_outside_margins = w->fringes_outside_margins ? Qt : Qnil;
5862 p->scroll_bar_width = w->scroll_bar_width; 5862 p->scroll_bar_width = w->scroll_bar_width;
5863 p->vertical_scroll_bar_type = w->vertical_scroll_bar_type; 5863 p->vertical_scroll_bar_type = w->vertical_scroll_bar_type;
5864 p->dedicated = w->dedicated; 5864 p->dedicated = w->dedicated;
@@ -6095,6 +6095,7 @@ display marginal areas and the text area. */)
6095 (Lisp_Object window, Lisp_Object left_width, Lisp_Object right_width, Lisp_Object outside_margins) 6095 (Lisp_Object window, Lisp_Object left_width, Lisp_Object right_width, Lisp_Object outside_margins)
6096{ 6096{
6097 struct window *w = decode_window (window); 6097 struct window *w = decode_window (window);
6098 int outside = !NILP (outside_margins);
6098 6099
6099 if (!NILP (left_width)) 6100 if (!NILP (left_width))
6100 CHECK_NATNUM (left_width); 6101 CHECK_NATNUM (left_width);
@@ -6105,11 +6106,11 @@ display marginal areas and the text area. */)
6105 if (FRAME_WINDOW_P (WINDOW_XFRAME (w)) 6106 if (FRAME_WINDOW_P (WINDOW_XFRAME (w))
6106 && (!EQ (w->left_fringe_width, left_width) 6107 && (!EQ (w->left_fringe_width, left_width)
6107 || !EQ (w->right_fringe_width, right_width) 6108 || !EQ (w->right_fringe_width, right_width)
6108 || !EQ (w->fringes_outside_margins, outside_margins))) 6109 || w->fringes_outside_margins != outside))
6109 { 6110 {
6110 w->left_fringe_width = left_width; 6111 w->left_fringe_width = left_width;
6111 w->right_fringe_width = right_width; 6112 w->right_fringe_width = right_width;
6112 w->fringes_outside_margins = outside_margins; 6113 w->fringes_outside_margins = outside;
6113 6114
6114 adjust_window_margins (w); 6115 adjust_window_margins (w);
6115 6116