Commit 2fa611b7 authored by Eli Zaretskii's avatar Eli Zaretskii
Browse files

Fix the Windows build broken by 2013-08-13T15:29:25Z!dmantipov@yandex.ru.

 src/window.c (Fwindow_margins): Return nil when there's no marginal
 area, as per the documented API.
 src/w32term.c (x_scroll_bar_create): Use ALLOCATE_PSEUDOVECTOR, not
 Fmake_vector, as scroll bar's struct members are not all Lisp
 objects now.  This avoids crashes in GC.
 src/w32term.h (struct scroll_bar): Convert fringe_extended_p to a
 bool, so its address could be taken.
parent 8259030d
2013-08-13 Eli Zaretskii <eliz@gnu.org>
* window.c (Fwindow_margins): Return nil when there's no marginal
area, as per the documented API.
* w32term.c (x_scroll_bar_create): Use ALLOCATE_PSEUDOVECTOR, not
Fmake_vector, as scroll bar's struct members are not all Lisp
objects now. This avoids crashes in GC.
* w32term.h (struct scroll_bar): Convert fringe_extended_p to a
bool, so its address could be taken.
2013-08-13 Lars Magne Ingebrigtsen <larsi@gnus.org>
* image.c (imagemagick_filename_hint): New function to possibly
......
......@@ -3757,7 +3757,7 @@ x_scroll_bar_create (struct window *w, int top, int left, int width, int height)
HWND hwnd;
SCROLLINFO si;
struct scroll_bar *bar
= XSCROLL_BAR (Fmake_vector (make_number (VECSIZE (struct scroll_bar)), Qnil));
= ALLOCATE_PSEUDOVECTOR (struct scroll_bar, fringe_extended_p, PVEC_OTHER);
Lisp_Object barobj;
block_input ();
......
......@@ -453,7 +453,9 @@ struct scroll_bar {
/* 1 if the background of the fringe that is adjacent to a scroll
bar is extended to the gap between the fringe and the bar. */
unsigned fringe_extended_p : 1;
/* Note: this could be a bit field, but we need to take its address
in ALLOCATE_PSEUDOVECTOR (see x_scroll_bar_create). */
bool fringe_extended_p;
};
/* Turning a lisp vector value into a pointer to a struct scroll_bar. */
......
......@@ -6171,8 +6171,8 @@ as nil. */)
(Lisp_Object window)
{
struct window *w = decode_live_window (window);
return Fcons (make_number (w->left_margin_cols),
make_number (w->right_margin_cols));
return Fcons (w->left_margin_cols ? make_number (w->left_margin_cols) : Qnil,
w->right_margin_cols ? make_number (w->right_margin_cols) : Qnil);
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment