Merge from `emacs-23'.

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)
             case RES_TYPE_NUMBER:
               return make_number (atoi (SDATA (tem)));
 
+            case RES_TYPE_BOOLEAN_NUMBER:
+              if (!strcmp (SDATA (tem), "on")
+                  || !strcmp (SDATA (tem), "true"))
+                return make_number (1);
+              return make_number (atoi (SDATA (tem)));
+              break;
+
             case RES_TYPE_FLOAT:
               return make_float (atof (SDATA (tem)));