Clean up merge error.

* nsterm.m (ns_set_vertical_scroll_bar)
(ns_set_horizontal_scroll_bar): Cleanup merge error.

2 files changed, 10 insertions, 1 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 2ef9c6ba9aa..36f4dbdac66 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2014-11-09  Jan Djärv  <jan.h.d@swipnet.se>
+
+        * nsterm.m (ns_set_vertical_scroll_bar)
+        (ns_set_horizontal_scroll_bar): Cleanup merge error.
+
 2014-11-09  Paul Eggert  <eggert@cs.ucla.edu>
 
         * xgselect.c (xg_select): Don't assume n_gfds is nonnegative
diff --git a/src/nsterm.m b/src/nsterm.m
index 318f14acfc8..577b2a27724 100644
--- a/src/nsterm.m
+++ b/src/nsterm.m
@@ -3832,7 +3832,8 @@ ns_set_vertical_scroll_bar (struct window *window,
         }
     }
 
-  [bar setPosition: position portion: portion whole: whole];
+  if (update_p)
+    [bar setPosition: position portion: portion whole: whole];
   unblock_input ();
 }
 
@@ -3852,6 +3853,7 @@ ns_set_horizontal_scroll_bar (struct window *window,
   int top, height, left, width;
   int window_x, window_width;
   int pixel_width = WINDOW_PIXEL_WIDTH (window);
+  BOOL update_p = YES;
 
   /* optimization; display engine sends WAY too many of these.. */
   if (!NILP (window->horizontal_scroll_bar))
@@ -3866,6 +3868,7 @@ ns_set_horizontal_scroll_bar (struct window *window,
             }
           else
             view->scrollbarsNeedingUpdate--;
+          update_p = NO;
         }
     }
 
@@ -3907,6 +3910,7 @@ ns_set_horizontal_scroll_bar (struct window *window,
 
       bar = [[EmacsScroller alloc] initFrame: r window: win];
       wset_horizontal_scroll_bar (window, make_save_ptr (bar));
+      update_p = YES;
     }
   else
     {