Conflicts when cvs-updating GNU Emacs 22.1.50

[Peter Dyballa]

Hello!

In src/frame.c I get:

        <<<<<<< frame.c
	#if defined (HAVE_CARBON) || defined (WINDOWSNT) || defined  
(HAVE_X_WINDOWS)
        Lisp_Object Qactive_alpha;
        Lisp_Object Qinactive_alpha;
        #endif
        =======
        Lisp_Object Qtty, Qtty_type;
        Lisp_Object Qwindow_system;
        Lisp_Object Qenvironment;
        Lisp_Object Qterm_environment_variable;
        Lisp_Object Qdisplay_environment_variable;
        >>>>>>> 1.345

and in src/macfns.c I get

        <<<<<<< macfns.c
          x_default_parameter (f, parms, Qscroll_bar_width, Qnil,
                               "scrollBarWidth", "ScrollBarWidth",
                               RES_TYPE_NUMBER);
          x_default_parameter (f, parms, Qactive_alpha, make_float(1.0),
                               "activeAlpha", "ActiveAlpha", RES_TYPE_FLOAT);
          x_default_parameter (f, parms, Qinactive_alpha, make_float(1.0),
                               "inactiveAlpha", "InactiveAlpha", 
RES_TYPE_FLOAT);
        =======
          x_default_parameter (f, parameters, Qscroll_bar_width, Qnil,
                               "scrollBarWidth", "ScrollBarWidth", 
RES_TYPE_NUMBER);
        >>>>>>> 1.111

Does this mean that transparency support has been removed? (I'v  
realised that parms have become parameters.)

--
Greetings

  Pete

To be is to do.
                       -- I. Kant
To do is to be.
                       -- A. Sartre
Yabba-Dabba-Doo!
                       -- F. Flintstone

PGP.sig
Description: Signierter Teil der Nachricht