diff options
| author | Tom Tromey | 2013-07-06 23:18:58 -0600 |
|---|---|---|
| committer | Tom Tromey | 2013-07-06 23:18:58 -0600 |
| commit | 6dacdad5fcb278e5a16b38bb81786aac9ca27be4 (patch) | |
| tree | f5f331ea361ba0f99e0f9b638d183ad492a7da31 /src/widget.c | |
| parent | 0a6f2ff0c8ceb29703e76cddd46ea3f176dd873a (diff) | |
| parent | 219afb88d9d484393418820d1c08dc93299110ec (diff) | |
| download | emacs-6dacdad5fcb278e5a16b38bb81786aac9ca27be4.tar.gz emacs-6dacdad5fcb278e5a16b38bb81786aac9ca27be4.zip | |
merge from trunk
this merges frmo trunk and fixes various build issues.
this needed a few ugly tweaks.
this hangs in "make check" now
Diffstat (limited to 'src/widget.c')
| -rw-r--r-- | src/widget.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/src/widget.c b/src/widget.c index 28e9fc29a91..e2c8e9fa23f 100644 --- a/src/widget.c +++ b/src/widget.c | |||
| @@ -656,7 +656,6 @@ resize_cb (Widget widget, | |||
| 656 | XEvent* event, | 656 | XEvent* event, |
| 657 | Boolean* continue_to_dispatch) | 657 | Boolean* continue_to_dispatch) |
| 658 | { | 658 | { |
| 659 | EmacsFrame ew = (EmacsFrame) widget; | ||
| 660 | EmacsFrameResize (widget); | 659 | EmacsFrameResize (widget); |
| 661 | } | 660 | } |
| 662 | 661 | ||