aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorMartin Rudalics2015-07-04 10:42:25 +0200
committerMartin Rudalics2015-07-04 10:42:25 +0200
commitcdd5e86967e0a3d23da3079dc5b17ace699e66b3 (patch)
tree2357864c21bc221042752996333832f1bc0b1d46 /src
parent19f71dcdc47d9b1ee0a3982391f1a2332fbc765e (diff)
downloademacs-cdd5e86967e0a3d23da3079dc5b17ace699e66b3.tar.gz
emacs-cdd5e86967e0a3d23da3079dc5b17ace699e66b3.zip
Fix processing of alpha parameter for Windows tip frames (Bug#17344)
* src/w32fns.c (x_create_tip_frame): Fix processing alpha parameter. (Bug#17344)
Diffstat (limited to 'src')
-rw-r--r--src/w32fns.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/w32fns.c b/src/w32fns.c
index 836dc10118d..fa26e67364c 100644
--- a/src/w32fns.c
+++ b/src/w32fns.c
@@ -5836,8 +5836,6 @@ x_create_tip_frame (struct w32_display_info *dpyinfo,
5836 "cursorColor", "Foreground", RES_TYPE_STRING); 5836 "cursorColor", "Foreground", RES_TYPE_STRING);
5837 x_default_parameter (f, parms, Qborder_color, build_string ("black"), 5837 x_default_parameter (f, parms, Qborder_color, build_string ("black"),
5838 "borderColor", "BorderColor", RES_TYPE_STRING); 5838 "borderColor", "BorderColor", RES_TYPE_STRING);
5839 x_default_parameter (f, parms, Qalpha, Qnil,
5840 "alpha", "Alpha", RES_TYPE_NUMBER);
5841 5839
5842 /* Init faces before x_default_parameter is called for the 5840 /* Init faces before x_default_parameter is called for the
5843 scroll-bar-width parameter because otherwise we end up in 5841 scroll-bar-width parameter because otherwise we end up in
@@ -5866,6 +5864,9 @@ x_create_tip_frame (struct w32_display_info *dpyinfo,
5866 "autoLower", "AutoRaiseLower", RES_TYPE_BOOLEAN); 5864 "autoLower", "AutoRaiseLower", RES_TYPE_BOOLEAN);
5867 x_default_parameter (f, parms, Qcursor_type, Qbox, 5865 x_default_parameter (f, parms, Qcursor_type, Qbox,
5868 "cursorType", "CursorType", RES_TYPE_SYMBOL); 5866 "cursorType", "CursorType", RES_TYPE_SYMBOL);
5867 /* Process alpha here (Bug#17344). */
5868 x_default_parameter (f, parms, Qalpha, Qnil,
5869 "alpha", "Alpha", RES_TYPE_NUMBER);
5869 5870
5870 /* Dimensions, especially FRAME_LINES (f), must be done via 5871 /* Dimensions, especially FRAME_LINES (f), must be done via
5871 change_frame_size. Change will not be effected unless different 5872 change_frame_size. Change will not be effected unless different