Re: Conflicts when cvs-updating GNU Emacs 22.1.50

[Dan Nicolaescu]

Peter Dyballa <address@hidden> writes:

  > 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;

AFAIK 22.1.50 is the EMACS_22_BASE branch, I can't fine any trace of
Qactive_alpha on that branch (nor in HEAD), either in code, change
logs, or documentation. Maybe you are referring to some other
branch...

  >     #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.)