aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorMartin Rudalics2014-02-02 14:00:41 +0100
committerMartin Rudalics2014-02-02 14:00:41 +0100
commitb41686493e1ba1c377c7d7621249a176a1dd4dd9 (patch)
tree52ef503a468ae616d718903234ed7a104ae8f21e /src
parentb8d552c2f07c80102139497398719e98768efdc7 (diff)
downloademacs-b41686493e1ba1c377c7d7621249a176a1dd4dd9.tar.gz
emacs-b41686493e1ba1c377c7d7621249a176a1dd4dd9.zip
In Fx_create_frame of w32fns.c process frame alpha earlier. (Bug#16619)
* w32fns.c (Fx_create_frame): Process frame alpha earlier. (Bug#16619)
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog5
-rw-r--r--src/w32fns.c5
2 files changed, 8 insertions, 2 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index c87b7e8b8e7..17c31844458 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
12014-02-02 Martin Rudalics <rudalics@gmx.at>
2
3 * w32fns.c (Fx_create_frame): Process frame alpha earlier.
4 (Bug#16619)
5
12014-02-01 Eli Zaretskii <eliz@gnu.org> 62014-02-01 Eli Zaretskii <eliz@gnu.org>
2 7
3 * w32fns.c (Ffile_system_info): Use WINAPI in the function 8 * w32fns.c (Ffile_system_info): Use WINAPI in the function
diff --git a/src/w32fns.c b/src/w32fns.c
index b688512da88..9628b3e604e 100644
--- a/src/w32fns.c
+++ b/src/w32fns.c
@@ -4503,6 +4503,9 @@ This function is an internal primitive--use `make-frame' instead. */)
4503 "leftFringe", "LeftFringe", RES_TYPE_NUMBER); 4503 "leftFringe", "LeftFringe", RES_TYPE_NUMBER);
4504 x_default_parameter (f, parameters, Qright_fringe, Qnil, 4504 x_default_parameter (f, parameters, Qright_fringe, Qnil,
4505 "rightFringe", "RightFringe", RES_TYPE_NUMBER); 4505 "rightFringe", "RightFringe", RES_TYPE_NUMBER);
4506 /* Process alpha here (Bug#16619). */
4507 x_default_parameter (f, parameters, Qalpha, Qnil,
4508 "alpha", "Alpha", RES_TYPE_NUMBER);
4506 4509
4507 /* Init faces before x_default_parameter is called for scroll-bar 4510 /* Init faces before x_default_parameter is called for scroll-bar
4508 parameters because that function calls x_set_scroll_bar_width, 4511 parameters because that function calls x_set_scroll_bar_width,
@@ -4595,8 +4598,6 @@ This function is an internal primitive--use `make-frame' instead. */)
4595 "cursorType", "CursorType", RES_TYPE_SYMBOL); 4598 "cursorType", "CursorType", RES_TYPE_SYMBOL);
4596 x_default_parameter (f, parameters, Qscroll_bar_width, Qnil, 4599 x_default_parameter (f, parameters, Qscroll_bar_width, Qnil,
4597 "scrollBarWidth", "ScrollBarWidth", RES_TYPE_NUMBER); 4600 "scrollBarWidth", "ScrollBarWidth", RES_TYPE_NUMBER);
4598 x_default_parameter (f, parameters, Qalpha, Qnil,
4599 "alpha", "Alpha", RES_TYPE_NUMBER);
4600 4601
4601 /* Dimensions, especially FRAME_LINES (f), must be done via change_frame_size. 4602 /* Dimensions, especially FRAME_LINES (f), must be done via change_frame_size.
4602 Change will not be effected unless different from the current 4603 Change will not be effected unless different from the current