diff options
| author | Joakim Verona | 2013-07-02 22:46:17 +0200 |
|---|---|---|
| committer | Joakim Verona | 2013-07-02 22:46:17 +0200 |
| commit | 3718127221fbbc31f8ebd027ab7c95403dbe9118 (patch) | |
| tree | ef422898f3344c8f94f6ecf63eb583122bbf2bd8 /src/widget.c | |
| parent | 1ce45b902c67b8a0dda8d71bd2812de29a9988a6 (diff) | |
| parent | a3b49114c186d84404226af75ae7905bd1cd018f (diff) | |
| download | emacs-3718127221fbbc31f8ebd027ab7c95403dbe9118.tar.gz emacs-3718127221fbbc31f8ebd027ab7c95403dbe9118.zip | |
Merge branch 'trunk' into xwidget
Conflicts:
src/window.c
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 | ||