* nsterm.m (EmacsScroller.dealloc): Reinstate, removed at merge

cleanup from 2014-11-01.

Fixes: debbugs:18972

diff --git a/src/ChangeLog b/src/ChangeLog
index a2a4e9dccafaa6dfabffef85e791abb6cc6b8ff1..4700e314a162fcd51bd337bc075dc1f938d915db 100644 (file)
--- 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 23a5918fac86b6c09889ae8fba78b1e9e2c1cf19..c8ad50ef3398ac8cbac44ebea04b7ae3c6614ee8 100644 (file)
--- 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);