From 5fbfb018e06e1578199f2ac0d827535d29853085 Mon Sep 17 00:00:00 2001 From: Chong Yidong Date: Wed, 18 Jul 2012 16:11:08 +0800 Subject: [PATCH] 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 --- src/ChangeLog | 5 +++++ src/frame.c | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/src/ChangeLog b/src/ChangeLog index 1ad65ca020c..368c07f1b9b 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,8 @@ +2012-07-18 Chong Yidong + + * 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 Return more descriptive data from Fgarbage_collect. diff --git a/src/frame.c b/src/frame.c index 8f4bdc84a31..9668ea4d831 100644 --- 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) -- 2.39.2