aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorMiles Bader2008-01-29 05:12:00 +0000
committerMiles Bader2008-01-29 05:12:00 +0000
commit8b329dbaa78f6bea288ad4326914629197f757a1 (patch)
tree13de4fb7d399bd1a336f0db7037c95a8693a9a65 /src
parente652840bf703a633979983552556434f6753397b (diff)
downloademacs-8b329dbaa78f6bea288ad4326914629197f757a1.tar.gz
emacs-8b329dbaa78f6bea288ad4326914629197f757a1.zip
src/macterm.c (XTset_vertical_scroll_bar): Fix merge mistake
Revision: emacs@sv.gnu.org/emacs--devo--0--patch-1020
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog4
-rw-r--r--src/macterm.c2
2 files changed, 5 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 92cd97146f7..0645765cdde 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
12008-01-29 Miles Bader <miles@gnu.org>
2
3 * macterm.c (XTset_vertical_scroll_bar): Fix merge mistake.
4
12008-01-28 Jason Rumney <jasonr@gnu.org> 52008-01-28 Jason Rumney <jasonr@gnu.org>
2 6
3 * w32.c (stat): Don't double check for networked drive. 7 * w32.c (stat): Don't double check for networked drive.
diff --git a/src/macterm.c b/src/macterm.c
index 58de15cace0..7ffcbf55e9a 100644
--- a/src/macterm.c
+++ b/src/macterm.c
@@ -5300,7 +5300,7 @@ XTset_vertical_scroll_bar (w, portion, whole, position)
5300#if USE_CG_DRAWING 5300#if USE_CG_DRAWING
5301 mac_prepare_for_quickdraw (f); 5301 mac_prepare_for_quickdraw (f);
5302#endif 5302#endif
5303 Draw1Control (SCROLL_BAR_CONTROL_HANDLE (bar)); 5303 Draw1Control (SCROLL_BAR_CONTROL_REF (bar));
5304 } 5304 }
5305 } 5305 }
5306 else 5306 else