# HG changeset patch # User Miles Bader # Date 1201583520 0 # Node ID 9ea2c2750268c83364ba9b94c908d3d816715232 # Parent eae3aec0f807930bb379b03e2b562192f296fc3c src/macterm.c (XTset_vertical_scroll_bar): Fix merge mistake Revision: emacs@sv.gnu.org/emacs--devo--0--patch-1020 diff -r eae3aec0f807 -r 9ea2c2750268 src/ChangeLog --- a/src/ChangeLog Tue Jan 29 03:52:05 2008 +0000 +++ b/src/ChangeLog Tue Jan 29 05:12:00 2008 +0000 @@ -1,3 +1,7 @@ +2008-01-29 Miles Bader + + * macterm.c (XTset_vertical_scroll_bar): Fix merge mistake. + 2008-01-28 Jason Rumney * w32.c (stat): Don't double check for networked drive. diff -r eae3aec0f807 -r 9ea2c2750268 src/macterm.c --- a/src/macterm.c Tue Jan 29 03:52:05 2008 +0000 +++ b/src/macterm.c Tue Jan 29 05:12:00 2008 +0000 @@ -5300,7 +5300,7 @@ #if USE_CG_DRAWING mac_prepare_for_quickdraw (f); #endif - Draw1Control (SCROLL_BAR_CONTROL_HANDLE (bar)); + Draw1Control (SCROLL_BAR_CONTROL_REF (bar)); } } else