diff options
| author | Chong Yidong | 2012-07-18 16:11:08 +0800 |
|---|---|---|
| committer | Chong Yidong | 2012-07-18 16:11:08 +0800 |
| commit | 5fbfb018e06e1578199f2ac0d827535d29853085 (patch) | |
| tree | 381ba4815974e973641e55bd3c152674689d9103 /src/frame.c | |
| parent | 12999ea83fcd94462c1361371f5ab8a7f8c0db98 (diff) | |
| download | emacs-5fbfb018e06e1578199f2ac0d827535d29853085.tar.gz emacs-5fbfb018e06e1578199f2ac0d827535d29853085.zip | |
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
Diffstat (limited to 'src/frame.c')
| -rw-r--r-- | src/frame.c | 4 |
1 files changed, 2 insertions, 2 deletions
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) | |||
| 2868 | } | 2868 | } |
| 2869 | 2869 | ||
| 2870 | /* Don't die if just one of these was set. */ | 2870 | /* Don't die if just one of these was set. */ |
| 2871 | if (! TYPE_RANGED_INTEGERP (int, left)) | 2871 | if (EQ (left, Qunbound)) |
| 2872 | { | 2872 | { |
| 2873 | left_no_change = 1; | 2873 | left_no_change = 1; |
| 2874 | if (f->left_pos < 0) | 2874 | if (f->left_pos < 0) |
| @@ -2876,7 +2876,7 @@ x_set_frame_parameters (FRAME_PTR f, Lisp_Object alist) | |||
| 2876 | else | 2876 | else |
| 2877 | XSETINT (left, f->left_pos); | 2877 | XSETINT (left, f->left_pos); |
| 2878 | } | 2878 | } |
| 2879 | if (! TYPE_RANGED_INTEGERP (int, top)) | 2879 | if (EQ (top, Qunbound)) |
| 2880 | { | 2880 | { |
| 2881 | top_no_change = 1; | 2881 | top_no_change = 1; |
| 2882 | if (f->top_pos < 0) | 2882 | if (f->top_pos < 0) |