[Mac OS X] scroll bar is always displayed on new frame

[Nozomu Ando]

I have "(scroll-bar-mode -1)" in my .emacs, but
"(make-frame-command)" always create a new frame with vertical
scroll bar on Emacs/Carbon/Mac OS X.


In make_mac_frame() on src/macterm.c:8208,
'FRAME_VERTICAL_SCROLL_BAR_TYPE(f)' is overwritten
with 'vertical_scroll_bar_right'.

This clobbers the value set in Fx_create_frame()
on macnfs.c:2833.


With the following patch, it seems to work fine for me.
But I cannot build Emacs for Mac OS 9, so
I doubt that this is the correct fix.

Regards,
Nozomu Ando

---
Index: macterm.c
===================================================================
RCS file: /cvsroot/emacs/emacs/src/macterm.c,v
retrieving revision 1.56
diff -u -c -r1.56 macterm.c
cvs server: conflicting specifications of output style
*** macterm.c   21 Jan 2004 04:02:39 -0000      1.56
--- macterm.c   24 Jan 2004 16:30:14 -0000
***************
*** 8205,8213 ****
  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);
--- 8205,8210 ----
***************
*** 8255,8260 ****
--- 8252,8260 ----
  
    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);
  
---

In GNU Emacs 21.3.50.1 (powerpc-apple-darwin7.2.0)
 of 2004-01-24 on rio
configured using `configure '--without-x''

Important settings:
  value of $LC_ALL: nil
  value of $LC_COLLATE: nil
  value of $LC_CTYPE: nil
  value of $LC_MESSAGES: nil
  value of $LC_MONETARY: nil
  value of $LC_NUMERIC: nil
  value of $LC_TIME: nil
  value of $LANG: nil
  locale-coding-system: nil
  default-enable-multibyte-characters: t

Major mode: C

Minor modes in effect:
  encoded-kbd-mode: t
  mouse-wheel-mode: t
  menu-bar-mode: t
  global-font-lock-mode: 0
  unify-8859-on-encoding-mode: t
  utf-translate-cjk-mode: t
  line-number-mode: t
  abbrev-mode: t

Recent input:
C-n C-n C-n C-n C-n C-n C-x 2 C-x C-b C-n C-n f p w 
d <return> l s <return> c v s SPC d i f f SPC m a k 
e <backspace> <backspace> <backspace> <backspace> m 
a c C-c C-u C-x C-b C-n C-n C-n C-n C-n C-n C-n C-n 
C-n C-n C-n C-n C-n C-n C-n f C-x C-b C-n C-n C-n C-n 
C-n C-n C-n C-n C-n f C-x 1 C-x C-b C-n C-n C-n f C-l 
M-x m e w C-g <escape> x r e p o r t SPC e SPC b SPC 
<return>

Recent messages:
Saving file /work/emacs/src/macterm.c...
Wrote /work/emacs/src/macterm.c
Saving file /work/emacs/src/macterm.c...
Wrote /work/emacs/src/macterm.c
Commands: d, s, x, u; f, o, 1, 2, m, v; ~, %; q to quit; ? for help.
Saving file /work/emacs/src/macterm.c...
Wrote /work/emacs/src/macterm.c
Commands: d, s, x, u; f, o, 1, 2, m, v; ~, %; q to quit; ? for help. [5 times]
Quit
Loading emacsbug...done