[Emacs-diffs] trunk r118335: Clean up merge error.

[Jan D.]

------------------------------------------------------------
revno: 118335
revision-id: address@hidden
parent: address@hidden
committer: Jan D. <address@hidden>
branch nick: trunk
timestamp: Sun 2014-11-09 11:23:46 +0100
message:
  Clean up merge error.
  
  * nsterm.m (ns_set_vertical_scroll_bar)
  (ns_set_horizontal_scroll_bar): Cleanup merge error.
modified:
  src/ChangeLog                  changelog-20091113204419-o5vbwnq5f7feedwu-1438
  src/nsterm.m                   nsterm.m-20091113204419-o5vbwnq5f7feedwu-8747

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2014-11-09 04:19:54 +0000
+++ b/src/ChangeLog     2014-11-09 10:23:46 +0000
@@ -1,3 +1,8 @@
+2014-11-09  Jan Djärv  <address@hidden>
+
+       * nsterm.m (ns_set_vertical_scroll_bar)
+       (ns_set_horizontal_scroll_bar): Cleanup merge error.
+
 2014-11-09  Paul Eggert  <address@hidden>
 
        * xgselect.c (xg_select): Don't assume n_gfds is nonnegative

=== modified file 'src/nsterm.m'
--- a/src/nsterm.m      2014-11-08 21:32:10 +0000
+++ b/src/nsterm.m      2014-11-09 10:23:46 +0000
@@ -3832,7 +3832,8 @@
         }
     }
 
-  [bar setPosition: position portion: portion whole: whole];
+  if (update_p)
+    [bar setPosition: position portion: portion whole: whole];
   unblock_input ();
 }
 
@@ -3852,6 +3853,7 @@
   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 @@
             }
           else
             view->scrollbarsNeedingUpdate--;
+          update_p = NO;
         }
     }
 
@@ -3907,6 +3910,7 @@
 
       bar = [[EmacsScroller alloc] initFrame: r window: win];
       wset_horizontal_scroll_bar (window, make_save_ptr (bar));
+      update_p = YES;
     }
   else
     {