diff options
| author | Eli Zaretskii | 2014-10-14 21:10:37 +0300 |
|---|---|---|
| committer | Eli Zaretskii | 2014-10-14 21:10:37 +0300 |
| commit | e3060a0c4d2f418ac786775109d71e5843ccf42e (patch) | |
| tree | 347b37fc39d0db9cd23b3e9f79ee81b4bbc40f08 /src/widget.c | |
| parent | 1a3eca0656bdb764200e10a4f264138e94b1f3ce (diff) | |
| parent | 980d78b3587560c13a46aef352ed8d5ed744acf6 (diff) | |
| download | emacs-e3060a0c4d2f418ac786775109d71e5843ccf42e.tar.gz emacs-e3060a0c4d2f418ac786775109d71e5843ccf42e.zip | |
Merge from trunk and resolve conflicts.
Diffstat (limited to 'src/widget.c')
| -rw-r--r-- | src/widget.c | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/src/widget.c b/src/widget.c index b5b76bb306b..baa6a2ab917 100644 --- a/src/widget.c +++ b/src/widget.c | |||
| @@ -579,15 +579,6 @@ EmacsFrameResize (Widget widget) | |||
| 579 | if (true || frame_resize_pixelwise) | 579 | if (true || frame_resize_pixelwise) |
| 580 | { | 580 | { |
| 581 | int width, height; | 581 | int width, height; |
| 582 | /** int width = (ew->core.width **/ | ||
| 583 | /** - FRAME_SCROLL_BAR_AREA_WIDTH (f) **/ | ||
| 584 | /** - FRAME_TOTAL_FRINGE_WIDTH (f) **/ | ||
| 585 | /** - 2 * FRAME_INTERNAL_BORDER_WIDTH (f)); **/ | ||
| 586 | |||
| 587 | /** int height = (ew->core.height **/ | ||
| 588 | /** - FRAME_TOOLBAR_HEIGHT (f) **/ | ||
| 589 | /** - FRAME_SCROLL_BAR_AREA_HEIGHT (f) **/ | ||
| 590 | /** - 2 * FRAME_INTERNAL_BORDER_WIDTH (f)); **/ | ||
| 591 | 582 | ||
| 592 | pixel_to_text_size (ew, ew->core.width, ew->core.height, &width, &height); | 583 | pixel_to_text_size (ew, ew->core.width, ew->core.height, &width, &height); |
| 593 | change_frame_size (f, width, height, 0, 1, 0, 1); | 584 | change_frame_size (f, width, height, 0, 1, 0, 1); |