aboutsummaryrefslogtreecommitdiffstats
path: root/src/frame.c
diff options
context:
space:
mode:
authorEli Zaretskii2010-03-28 09:04:11 -0400
committerEli Zaretskii2010-03-28 09:04:11 -0400
commite7dbdb6dfc3ffdc25f8d32a43683500f596d9784 (patch)
treee7e73d34fe234175f7da59690ec5abf6f73b89a7 /src/frame.c
parent34689d3c1ad54fd463d5f20c64bb1ac655dc5741 (diff)
parent22ef1944028e9ac89a9717439b175ce3230a4ba1 (diff)
downloademacs-e7dbdb6dfc3ffdc25f8d32a43683500f596d9784.tar.gz
emacs-e7dbdb6dfc3ffdc25f8d32a43683500f596d9784.zip
Merge from mainline.
Diffstat (limited to 'src/frame.c')
-rw-r--r--src/frame.c7
1 files changed, 7 insertions, 0 deletions
diff --git a/src/frame.c b/src/frame.c
index 40930af594c..757ed8f01a3 100644
--- a/src/frame.c
+++ b/src/frame.c
@@ -4005,6 +4005,13 @@ x_get_arg (dpyinfo, alist, param, attribute, class, type)
4005 case RES_TYPE_NUMBER: 4005 case RES_TYPE_NUMBER:
4006 return make_number (atoi (SDATA (tem))); 4006 return make_number (atoi (SDATA (tem)));
4007 4007
4008 case RES_TYPE_BOOLEAN_NUMBER:
4009 if (!strcmp (SDATA (tem), "on")
4010 || !strcmp (SDATA (tem), "true"))
4011 return make_number (1);
4012 return make_number (atoi (SDATA (tem)));
4013 break;
4014
4008 case RES_TYPE_FLOAT: 4015 case RES_TYPE_FLOAT:
4009 return make_float (atof (SDATA (tem))); 4016 return make_float (atof (SDATA (tem)));
4010 4017