# HG changeset patch
# User Steven Tamm <steventamm@mac.com>
# Date 1075188761 0
# Node ID 4f64eb1ea14821598baadd3b20147f0883689123
# Parent  40f76024a6c1b29fd68baf031e418ffd7426a43e
Move setting of scroll bars from make_mac_frame to
make_mac_terminal_frame to prevent clobbering of
scroll-bar-mode.

diff -r 40f76024a6c1 -r 4f64eb1ea148 src/ChangeLog
--- a/src/ChangeLog	Tue Jan 27 07:31:36 2004 +0000
+++ b/src/ChangeLog	Tue Jan 27 07:32:41 2004 +0000
@@ -1,3 +1,10 @@
+2004-01-27  Steven Tamm <steventamm@mac.com>
+
+	* macterm.c (make_mac_frame, make_mac_terminal_frame): Move
+	setting of scroll bars from make_mac_frame to
+	make_mac_terminal_frame to prevent clobbering of
+	scroll-bar-mode.
+
 2004-01-26  Richard M. Stallman  <rms@gnu.org>
 
 	* search.c (Freplace_match): Handle nonexistent
diff -r 40f76024a6c1 -r 4f64eb1ea148 src/macterm.c
--- a/src/macterm.c	Tue Jan 27 07:31:36 2004 +0000
+++ b/src/macterm.c	Tue Jan 27 07:32:41 2004 +0000
@@ -8205,9 +8205,6 @@
 void
 make_mac_frame (struct frame *f)
 {
-  FRAME_CAN_HAVE_SCROLL_BARS (f) = 1;
-  FRAME_VERTICAL_SCROLL_BAR_TYPE (f) = vertical_scroll_bar_right;
-
   FRAME_DESIRED_CURSOR (f) = FILLED_BOX_CURSOR;
 
   NewMacWindow(f);
@@ -8256,6 +8253,9 @@
   FRAME_COLS (f) = 96;
   FRAME_LINES (f) = 4;
 
+  FRAME_CAN_HAVE_SCROLL_BARS (f) = 1;
+  FRAME_VERTICAL_SCROLL_BAR_TYPE (f) = vertical_scroll_bar_right;
+
   make_mac_frame (f);
 
   x_make_gc (f);