Revert bogus change in 2011-07-28T21:49:16Z!eggert@cs.ucla.edu.

* src/frame.c (x_set_frame_parameters): Revert bogus change introduced
in 2012-05-25 commit by Paul Eggert.

Fixes: debbugs:11738

diff --git a/src/ChangeLog b/src/ChangeLog
index 1ad65ca020c65136df4a411394fe070446ebab98..368c07f1b9b54a5e09d1b7434bcf5b968d5bafc0 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2012-07-18  Chong Yidong  <cyd@gnu.org>
+
+       * frame.c (x_set_frame_parameters): Revert bogus change introduced
+       in 2012-05-25 commit by Paul Eggert (Bug#11738).
+
 2012-07-18  Dmitry Antipov  <dmantipov@yandex.ru>
 
        Return more descriptive data from Fgarbage_collect.

diff --git a/src/frame.c b/src/frame.c
index 8f4bdc84a31cbaa716945c8075cdb1afecb76f32..9668ea4d8319418fa0783d91eba349b7a38157f5 100644 (file)
--- a/src/frame.c
+++ b/src/frame.c
@@ -2868,7 +2868,7 @@ x_set_frame_parameters (FRAME_PTR f, Lisp_Object alist)
     }
 
   /* Don't die if just one of these was set.  */
-  if (! TYPE_RANGED_INTEGERP (int, left))
+  if (EQ (left, Qunbound))
     {
       left_no_change = 1;
       if (f->left_pos < 0)
@@ -2876,7 +2876,7 @@ x_set_frame_parameters (FRAME_PTR f, Lisp_Object alist)
       else
        XSETINT (left, f->left_pos);
     }
-  if (! TYPE_RANGED_INTEGERP (int, top))
+  if (EQ (top, Qunbound))
     {
       top_no_change = 1;
       if (f->top_pos < 0)