[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] /srv/bzr/emacs/trunk r109464: Fix Windows build errors int
From: |
Dmitry Antipov |
Subject: |
[Emacs-diffs] /srv/bzr/emacs/trunk r109464: Fix Windows build errors introduced after converting to FGET and FSET. |
Date: |
Mon, 06 Aug 2012 13:28:17 +0400 |
User-agent: |
Bazaar (2.5.0) |
------------------------------------------------------------
revno: 109464
committer: Dmitry Antipov <address@hidden>
branch nick: trunk
timestamp: Mon 2012-08-06 13:28:17 +0400
message:
Fix Windows build errors introduced after converting to FGET and FSET.
* w32term.c (x_frame_rehighlight, x_scroll_bar_create):
(w32_condemn_scroll_bars, w32_redeem_scroll_bar):
(w32_judge_scroll_bars): Change to use FSET.
Reported by Andy Moreton <address@hidden>.
modified:
src/ChangeLog
src/w32term.c
=== modified file 'src/ChangeLog'
--- a/src/ChangeLog 2012-08-06 08:32:49 +0000
+++ b/src/ChangeLog 2012-08-06 09:28:17 +0000
@@ -1,5 +1,13 @@
2012-08-06 Dmitry Antipov <address@hidden>
+ Fix Windows build errors introduced after converting to FGET and FSET.
+ * w32term.c (x_frame_rehighlight, x_scroll_bar_create):
+ (w32_condemn_scroll_bars, w32_redeem_scroll_bar):
+ (w32_judge_scroll_bars): Change to use FSET.
+ Reported by Andy Moreton <address@hidden>.
+
+2012-08-06 Dmitry Antipov <address@hidden>
+
Fix replacement typo.
* window.c (replace_window): Set root_window instead of
selected_window. This fixes a total window subsystem
=== modified file 'src/w32term.c'
--- a/src/w32term.c 2012-08-06 05:27:54 +0000
+++ b/src/w32term.c 2012-08-06 09:28:17 +0000
@@ -2972,7 +2972,7 @@
: dpyinfo->w32_focus_frame);
if (! FRAME_LIVE_P (dpyinfo->x_highlight_frame))
{
- FRAME_FOCUS_FRAME (dpyinfo->w32_focus_frame) = Qnil;
+ FSET (dpyinfo->w32_focus_frame, focus_frame, Qnil);
dpyinfo->x_highlight_frame = dpyinfo->w32_focus_frame;
}
}
@@ -3612,6 +3612,7 @@
SCROLLINFO si;
struct scroll_bar *bar
= XSCROLL_BAR (Fmake_vector (make_number (SCROLL_BAR_VEC_SIZE), Qnil));
+ Lisp_Object barobj;
BLOCK_INPUT;
@@ -3644,7 +3645,8 @@
/* Add bar to its frame's list of scroll bars. */
bar->next = FRAME_SCROLL_BARS (f);
bar->prev = Qnil;
- XSETVECTOR (FRAME_SCROLL_BARS (f), bar);
+ XSETVECTOR (barobj, bar);
+ FSET (f, scroll_bars, barobj);
if (! NILP (bar->next))
XSETVECTOR (XSCROLL_BAR (bar->next)->prev, bar);
@@ -3829,12 +3831,12 @@
{
Lisp_Object bar;
bar = FRAME_SCROLL_BARS (frame);
- FRAME_SCROLL_BARS (frame) = XSCROLL_BAR (bar)->next;
+ FSET (frame, scroll_bars, XSCROLL_BAR (bar)->next);
XSCROLL_BAR (bar)->next = FRAME_CONDEMNED_SCROLL_BARS (frame);
XSCROLL_BAR (bar)->prev = Qnil;
if (! NILP (FRAME_CONDEMNED_SCROLL_BARS (frame)))
XSCROLL_BAR (FRAME_CONDEMNED_SCROLL_BARS (frame))->prev = bar;
- FRAME_CONDEMNED_SCROLL_BARS (frame) = bar;
+ FSET (frame, condemned_scroll_bars, bar);
}
}
@@ -3846,6 +3848,7 @@
w32_redeem_scroll_bar (struct window *window)
{
struct scroll_bar *bar;
+ Lisp_Object barobj;
struct frame *f;
/* We can't redeem this window's scroll bar if it doesn't have one. */
@@ -3865,7 +3868,7 @@
return;
else if (EQ (FRAME_CONDEMNED_SCROLL_BARS (f),
WVAR (window, vertical_scroll_bar)))
- FRAME_CONDEMNED_SCROLL_BARS (f) = bar->next;
+ FSET (f, condemned_scroll_bars, bar->next);
else
/* If its prev pointer is nil, it must be at the front of
one or the other! */
@@ -3879,7 +3882,8 @@
bar->next = FRAME_SCROLL_BARS (f);
bar->prev = Qnil;
- XSETVECTOR (FRAME_SCROLL_BARS (f), bar);
+ XSETVECTOR (barobj, bar);
+ FSET (f, scroll_bars, barobj);
if (! NILP (bar->next))
XSETVECTOR (XSCROLL_BAR (bar->next)->prev, bar);
}
@@ -3896,7 +3900,7 @@
/* Clear out the condemned list now so we won't try to process any
more events on the hapless scroll bars. */
- FRAME_CONDEMNED_SCROLL_BARS (f) = Qnil;
+ FSET (f, condemned_scroll_bars, Qnil);
for (; ! NILP (bar); bar = next)
{
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] /srv/bzr/emacs/trunk r109464: Fix Windows build errors introduced after converting to FGET and FSET.,
Dmitry Antipov <=