[Emacs-diffs] trunk r118314: * nsterm.m (EmacsScroller.dealloc): Reinstate, removed at merge

[Jan D.]

------------------------------------------------------------
revno: 118314
revision-id: address@hidden
parent: address@hidden
fixes bug: http://debbugs.gnu.org/18972
committer: Jan D. <address@hidden>
branch nick: trunk
timestamp: Sat 2014-11-08 09:47:45 +0100
message:
  * nsterm.m (EmacsScroller.dealloc): Reinstate, removed at merge
  cleanup from 2014-11-01.
modified:
  src/ChangeLog                  changelog-20091113204419-o5vbwnq5f7feedwu-1438
  src/nsterm.m                   nsterm.m-20091113204419-o5vbwnq5f7feedwu-8747

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2014-11-07 16:25:35 +0000
+++ b/src/ChangeLog     2014-11-08 08:47:45 +0000
@@ -1,3 +1,8 @@
+2014-11-08  Jan Djärv  <address@hidden>
+
+       * nsterm.m (EmacsScroller.dealloc): Reinstate, removed at merge
+       cleanup from 2014-11-01 (Bug#18972).
+
 2014-11-07  Stefan Monnier  <address@hidden>
 
        * keyboard.c: Call gui-set-selection instead of x-set-selection.

=== modified file 'src/nsterm.m'
--- a/src/nsterm.m      2014-11-01 20:06:49 +0000
+++ b/src/nsterm.m      2014-11-08 08:47:45 +0000
@@ -7192,6 +7192,16 @@
 }
 
 
+- (void)dealloc
+{
+  NSTRACE (EmacsScroller_dealloc);
+  if (window)
+    wset_vertical_scroll_bar (window, Qnil);
+  window = 0;
+  [super dealloc];
+}
+
+
 - condemn
 {
   NSTRACE (condemn);