procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Clean up merge error.

Browse source 
* nsterm.m (ns_set_vertical_scroll_bar)
(ns_set_horizontal_scroll_bar): Cleanup merge error.
This commit is contained in:
Jan Djärv 2014-11-09 11:23:46 +01:00
parent 57db3f3adc
commit 1af3b1135a
2 changed files with 10 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/ChangeLog
View file

@ -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

6
src/nsterm.m
View file

@ -3832,7 +3832,8 @@ overwriting cursor (usually when cursor on a tab) */
}
}
[bar setPosition: position portion: portion whole: whole];
if (update_p)
[bar setPosition: position portion: portion whole: whole];
unblock_input ();
}
@ -3852,6 +3853,7 @@ overwriting cursor (usually when cursor on a tab) */
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 @@ overwriting cursor (usually when cursor on a tab) */
}
else
view->scrollbarsNeedingUpdate--;
update_p = NO;
}
}
@ -3907,6 +3910,7 @@ overwriting cursor (usually when cursor on a tab) */
bar = [[EmacsScroller alloc] initFrame: r window: win];
wset_horizontal_scroll_bar (window, make_save_ptr (bar));
update_p = YES;
}
else
{