Mercurial > emacs

changeset 88055:9ea2c2750268

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
src/macterm.c (XTset_vertical_scroll_bar): Fix merge mistake Revision: emacs@sv.gnu.org/emacs--devo--0--patch-1020
author Miles Bader <miles@gnu.org>
date Tue, 29 Jan 2008 05:12:00 +0000
parents eae3aec0f807
children 7dc2524306eb
files src/ChangeLog src/macterm.c
diffstat 2 files changed, 5 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- 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  <miles@gnu.org>
+
+	* macterm.c (XTset_vertical_scroll_bar): Fix merge mistake.
+
 2008-01-28  Jason Rumney  <jasonr@gnu.org>
 
 	* w32.c (stat): Don't double check for networked drive.
--- 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