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

cleanup from 2014-11-01. Fixes: debbugs:18972

* nsterm.m (EmacsScroller.dealloc): Reinstate, removed at merge
cleanup from 2014-11-01. Fixes: debbugs:18972
a05fd1fc · Jan Djärv · 2b513c3b · a05fd1fc · a05fd1fc
Commit a05fd1fc authored Nov 08, 2014 by Jan Djärv
Hide whitespace changes
Inline Side-by-side

Showing with 15 additions and 0 deletions

src/ChangeLog src/ChangeLog +5 -0

src/nsterm.m src/nsterm.m +10 -0

No files found.
--- a/src/ChangeLog
+++ b/src/ChangeLog
+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.

--- a/src/nsterm.m
+++ b/src/nsterm.m
@@ -7192,6 +7192,16 @@ - (void)setFrame: (NSRect)newRect
 }


+- (void)dealloc
+{
+  NSTRACE (EmacsScroller_dealloc);
+  if (window)
+    wset_vertical_scroll_bar (window, Qnil);
+  window = 0;
+  [super dealloc];
+}
+
+
 - condemn
 {
  NSTRACE (condemn);