[Emacs-diffs] Changes to emacs/src/macfns.c [lexbind]

[Miles Bader]

Index: emacs/src/macfns.c
diff -c emacs/src/macfns.c:1.3.2.6 emacs/src/macfns.c:1.3.2.7
*** emacs/src/macfns.c:1.3.2.6  Fri Mar 19 23:29:20 2004
--- emacs/src/macfns.c  Tue Jul  6 09:14:36 2004
***************
*** 2598,2604 ****
  
    if (!NILP (parent))
      {
!       f->output_data.mac->parent_desc = (Window) parent;
        f->output_data.mac->explicit_parent = 1;
      }
    else
--- 2598,2604 ----
  
    if (!NILP (parent))
      {
!       f->output_data.mac->parent_desc = (Window) XFASTINT (parent);
        f->output_data.mac->explicit_parent = 1;
      }
    else
***************
*** 2708,2714 ****
  
    x_default_parameter (f, parms, Qmenu_bar_lines, make_number (1),
                       "menuBar", "MenuBar", RES_TYPE_NUMBER);
!   x_default_parameter (f, parms, Qtool_bar_lines, make_number (0),
                         "toolBar", "ToolBar", RES_TYPE_NUMBER);
    x_default_parameter (f, parms, Qbuffer_predicate, Qnil,
                       "bufferPredicate", "BufferPredicate", RES_TYPE_SYMBOL);
--- 2708,2714 ----
  
    x_default_parameter (f, parms, Qmenu_bar_lines, make_number (1),
                       "menuBar", "MenuBar", RES_TYPE_NUMBER);
!   x_default_parameter (f, parms, Qtool_bar_lines, make_number (1),
                         "toolBar", "ToolBar", RES_TYPE_NUMBER);
    x_default_parameter (f, parms, Qbuffer_predicate, Qnil,
                       "bufferPredicate", "BufferPredicate", RES_TYPE_SYMBOL);