Handling of commits in emacs-23 branch and trunk.

Handling of commits in emacs-23 branch and trunk.

[Jan Djärv]

Hello.

Now that trunk ia ANSI-C-ified, how shall emacs-23 commits that change 
prototypes or add functions be handeled?  Shall we put them in emacs-23 with 
P__ + K&R and then fix them in trunk when they get merged there, or just 
convert to ANSI-C in emacs-23 also?

	Jan D.

Re: Handling of commits in emacs-23 branch and trunk.

[Eli Zaretskii]

> Date: Wed, 14 Jul 2010 09:47:00 +0200
> From: Jan Djärv <jan.h.d@swipnet.se>
> 
> Now that trunk ia ANSI-C-ified, how shall emacs-23 commits that change 
> prototypes or add functions be handeled?  Shall we put them in emacs-23 with 
> P__ + K&R and then fix them in trunk when they get merged there, or just 
> convert to ANSI-C in emacs-23 also?

I think the former (i.e. K&R).  These new functions will then need to
be converted to ANSI C when merged to the trunk.  Anything else means
more pain during the merge from emacs-23 to the trunk.

But please wait for Stefan and Yidong to respond.

Re: Handling of commits in emacs-23 branch and trunk.

[Dan Nicolaescu]

Jan Djärv <jan.h.d@swipnet.se> writes:

> Hello.
>
> Now that trunk ia ANSI-C-ified, how shall emacs-23 commits that change
> prototypes or add functions be handeled?  Shall we put them in
> emacs-23 with P__ + K&R and then fix them in trunk when they get
> merged there, or just convert to ANSI-C in emacs-23 also?

Add new functions as standard C, there's already a few like that in
emacs-23, so it's impossible to compile with a K&R compiler, so using
K&R will just generate more work when merging to the trunk.
If a function definition/declaration changes, convert it to standard C.

Re: Handling of commits in emacs-23 branch and trunk.

[Jan Djärv]

I still have to make Gtk+ 3 fixes in the trunk so I went ahead and used old style. 

    Jan D.

14 jul 2010 kl. 17:27 skrev Dan Nicolaescu <dann@gnu.org>:

> Jan Djärv <jan.h.d@swipnet.se> writes:
> 
>> Hello.
>> 
>> Now that trunk ia ANSI-C-ified, how shall emacs-23 commits that change
>> prototypes or add functions be handeled?  Shall we put them in
>> emacs-23 with P__ + K&R and then fix them in trunk when they get
>> merged there, or just convert to ANSI-C in emacs-23 also?
> 
> Add new functions as standard C, there's already a few like that in
> emacs-23, so it's impossible to compile with a K&R compiler, so using
> K&R will just generate more work when merging to the trunk.
> If a function definition/declaration changes, convert it to standard C.

Re: Handling of commits in emacs-23 branch and trunk.

[Stefan Monnier]

> Now that trunk ia ANSI-C-ified, how shall emacs-23 commits that change
> prototypes or add functions be handeled?

The switch to ANSI C was done in Emacs-23 already.  All that happened
recently is to actively change old code to use the new ANSI syntax, but
Emacs-23 already uses the ANSI syntax in various places.
I.e. all new code in all branches should use ANSI syntax.


        Stefan