Merged from emacs@sv.gnu.org

Patches applied:

 * emacs@sv.gnu.org/emacs--devo--0--patch-136
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-137
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-138
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-139
   Merge from gnus--rel--5.10

 * emacs@sv.gnu.org/emacs--devo--0--patch-140
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-141
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-142
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-143
   Merge from gnus--rel--5.10

 * emacs@sv.gnu.org/gnus--rel--5.10--patch-49
   Merge from emacs--devo--0

 * emacs@sv.gnu.org/gnus--rel--5.10--patch-50
   Update from CVS

 * emacs@sv.gnu.org/gnus--rel--5.10--patch-51
   Update from CVS

 * emacs@sv.gnu.org/gnus--rel--5.10--patch-52
   Merge from emacs--devo--0

 * emacs@sv.gnu.org/gnus--rel--5.10--patch-53
   Update from CVS: Makefile.in (release-*): New targets.

 * emacs@sv.gnu.org/gnus--rel--5.10--patch-54
   Update from CVS

 * emacs@sv.gnu.org/gnus--rel--5.10--patch-55
   Update from CVS

git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-527

1 files changed, 4 insertions, 0 deletions

diff --git a/src/macterm.h b/src/macterm.h
index 107814ddb3f..42020811e6c 100644
--- a/src/macterm.h
+++ b/src/macterm.h
@@ -516,6 +516,10 @@ struct scroll_bar {
    text from glomming up against the scroll bar */
 #define VERTICAL_SCROLL_BAR_WIDTH_TRIM (0)
 
+/* Variations of possible Aqua scroll bar width.  */
+#define MAC_AQUA_VERTICAL_SCROLL_BAR_WIDTH (15)
+#define MAC_AQUA_SMALL_VERTICAL_SCROLL_BAR_WIDTH (11)
+
 /* Size of hourglass controls */
 #define HOURGLASS_WIDTH 16
 #define HOURGLASS_HEIGHT 16