aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorEli Zaretskii2010-08-17 23:05:50 +0300
committerEli Zaretskii2010-08-17 23:05:50 +0300
commit0cc5642708811f2a2e19fe87072e1076837abf99 (patch)
treef6067b753c55d883e42c3efd82d934b70c6b3714 /src
parentf0b7054e2332727566d5080e768b2acaddba40ad (diff)
downloademacs-0cc5642708811f2a2e19fe87072e1076837abf99.tar.gz
emacs-0cc5642708811f2a2e19fe87072e1076837abf99.zip
Fix bug #6796.
w32fns.c <w32_frame_parm_handlers>: Add a slot for the x_set_tool_bar_position handler, needed to support changes from 2010-07-29T16:49:59Z!jan.h.d@swipnet.se for positioning the tool bar.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog6
-rw-r--r--src/w32fns.c1
2 files changed, 7 insertions, 0 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index bfc2f3582a6..c1295e6bd29 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,9 @@
12010-08-17 Eli Zaretskii <eliz@gnu.org>
2
3 * w32fns.c <w32_frame_parm_handlers>: Add a slot for the
4 x_set_tool_bar_position handler, needed to support changes from
5 2010-07-29T16:49:59Z!jan.h.d@swipnet.se for positioning the tool bar. (Bug#6796)
6
12010-08-16 Jan Djärv <jan.h.d@swipnet.se> 72010-08-16 Jan Djärv <jan.h.d@swipnet.se>
2 8
3 * nsselect.m: include keyboard.h for QPRIMARY, remove its 9 * nsselect.m: include keyboard.h for QPRIMARY, remove its
diff --git a/src/w32fns.c b/src/w32fns.c
index d1f21e8acdd..64d0d8cb6d1 100644
--- a/src/w32fns.c
+++ b/src/w32fns.c
@@ -6812,6 +6812,7 @@ frame_parm_handler w32_frame_parm_handlers[] =
6812 x_set_font_backend, 6812 x_set_font_backend,
6813 x_set_alpha, 6813 x_set_alpha,
6814 0, /* x_set_sticky */ 6814 0, /* x_set_sticky */
6815 0, /* x_set_tool_bar_position */
6815}; 6816};
6816 6817
6817void 6818void