Move setting of scroll bars from make_mac_frame to

make_mac_terminal_frame to prevent clobbering of
scroll-bar-mode.

diff --git a/src/ChangeLog b/src/ChangeLog
index f6fe4f950a4363bed126d6c8c2f54bc35503e591..6845cc8d1df7e2a4ac38de623e5c20020ff53f34 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -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 --git a/src/macterm.c b/src/macterm.c
index 8905df752d5cd848fdcb25c069587aa493aa5fcd..5446fd5efadcb5c76aadec9ff1ec2319a1ef8aba 100644 (file)
--- a/src/macterm.c
+++ b/src/macterm.c
@@ -8205,9 +8205,6 @@ NewMacWindow (FRAME_PTR fp)
 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 @@ make_mac_terminal_frame (struct frame *f)
   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);