diff options
| -rw-r--r-- | src/ChangeLog | 5 | ||||
| -rw-r--r-- | src/nsterm.m | 10 |
2 files changed, 15 insertions, 0 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index a2a4e9dccaf..4700e314a16 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,8 @@ +2014-11-08 Jan Djärv <jan.h.d@swipnet.se> + + * nsterm.m (EmacsScroller.dealloc): Reinstate, removed at merge + cleanup from 2014-11-01 (Bug#18972). + 2014-11-07 Stefan Monnier <monnier@iro.umontreal.ca> * keyboard.c: Call gui-set-selection instead of x-set-selection. diff --git a/src/nsterm.m b/src/nsterm.m index 23a5918fac8..c8ad50ef339 100644 --- a/src/nsterm.m +++ b/src/nsterm.m @@ -7192,6 +7192,16 @@ if (cols > 0 && rows > 0) } +- (void)dealloc +{ + NSTRACE (EmacsScroller_dealloc); + if (window) + wset_vertical_scroll_bar (window, Qnil); + window = 0; + [super dealloc]; +} + + - condemn { NSTRACE (condemn); |