From a05fd1fc7813611575cad6890a45b5fd7eba8e67 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Jan=20Dj=C3=A4rv?= <jan.h.d@swipnet.se>
Date: Sat, 8 Nov 2014 09:47:45 +0100
Subject: [PATCH] * nsterm.m (EmacsScroller.dealloc): Reinstate, removed at
 merge cleanup from 2014-11-01.

Fixes: debbugs:18972
---
 src/ChangeLog |  5 +++++
 src/nsterm.m  | 10 ++++++++++
 2 files changed, 15 insertions(+)

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);
-- 
2.39.5