diff options
| author | Richard M. Stallman | 1996-04-15 15:48:51 +0000 |
|---|---|---|
| committer | Richard M. Stallman | 1996-04-15 15:48:51 +0000 |
| commit | 093dd95bf5cac843a9b3f019052e90061737d5c8 (patch) | |
| tree | c87e4832b05cb40e9ae601b299097fa9007e7bd0 /src | |
| parent | 0a65b0328259bcb5e3589cd6ffe75f1484c819af (diff) | |
| download | emacs-093dd95bf5cac843a9b3f019052e90061737d5c8.tar.gz emacs-093dd95bf5cac843a9b3f019052e90061737d5c8.zip | |
(x_set_frame_parameters): Get height and width from
FRAME_NEW_WIDTH and FRAME_NEW_HEIGHT if nonzero.
Diffstat (limited to 'src')
| -rw-r--r-- | src/xfns.c | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/src/xfns.c b/src/xfns.c index 344fb921a5b..36d164a45c8 100644 --- a/src/xfns.c +++ b/src/xfns.c | |||
| @@ -831,9 +831,19 @@ x_set_frame_parameters (f, alist) | |||
| 831 | 831 | ||
| 832 | /* Don't die if just one of these was set. */ | 832 | /* Don't die if just one of these was set. */ |
| 833 | if (EQ (width, Qunbound)) | 833 | if (EQ (width, Qunbound)) |
| 834 | XSETINT (width, FRAME_WIDTH (f)); | 834 | { |
| 835 | if (FRAME_NEW_WIDTH (f)) | ||
| 836 | XSETINT (width, FRAME_NEW_WIDTH (f)); | ||
| 837 | else | ||
| 838 | XSETINT (width, FRAME_WIDTH (f)); | ||
| 839 | } | ||
| 835 | if (EQ (height, Qunbound)) | 840 | if (EQ (height, Qunbound)) |
| 836 | XSETINT (height, FRAME_HEIGHT (f)); | 841 | { |
| 842 | if (FRAME_NEW_HEIGHT (f)) | ||
| 843 | XSETINT (height, FRAME_NEW_HEIGHT (f)); | ||
| 844 | else | ||
| 845 | XSETINT (height, FRAME_HEIGHT (f)); | ||
| 846 | } | ||
| 837 | 847 | ||
| 838 | /* Don't set these parameters unless they've been explicitly | 848 | /* Don't set these parameters unless they've been explicitly |
| 839 | specified. The window might be mapped or resized while we're in | 849 | specified. The window might be mapped or resized while we're in |