(XTset_vertical_scroll_bar) [MAC_OSX]: Don't show scroll

bar if its width is smaller than that of Aqua small scroll bar.

diff --git a/src/ChangeLog b/src/ChangeLog
index fb36fff06cede55866a9d179c5c1697d6326eeab..0296646cf931a18bbcb9f547d4267a71bc0932b1 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,11 @@
+2007-03-07  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
+
+       * macfns.c (mac_set_scroll_bar_width, mac_frame_parm_handlers):
+       Undo 2006-03-06 changes.
+
+       * macterm.c (XTset_vertical_scroll_bar) [MAC_OSX]: Don't show scroll
+       bar if its width is smaller than that of Aqua small scroll bar.
+
 2007-03-07  Stefan Monnier  <monnier@iro.umontreal.ca>
 
        * minibuf.c (read_minibuf): Bind inhibit-read-only a bit longer so as

diff --git a/src/macterm.c b/src/macterm.c
index e0978066b845428f9ade79e4d9d28652a929f8dc..3dbee62d2aac1c0fc61e05ec1542b00499733567 100644 (file)
--- a/src/macterm.c
+++ b/src/macterm.c
@@ -5217,7 +5217,11 @@ XTset_vertical_scroll_bar (w, portion, whole, position)
 #ifdef USE_TOOLKIT_SCROLL_BARS
   if (NILP (bar->track_top))
     {
-      if (sb_width >= disp_height)
+      if (sb_width >= disp_height
+#ifdef MAC_OSX
+         || sb_width < MAC_AQUA_SMALL_VERTICAL_SCROLL_BAR_WIDTH
+#endif
+         )
        {
          XSETINT (bar->track_top, 0);
          XSETINT (bar->track_height, 0);