From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Eli Zaretskii Newsgroups: gmane.emacs.devel Subject: Re: Handling of commits in emacs-23 branch and trunk. Date: Wed, 14 Jul 2010 11:01:26 +0300 Message-ID: <83sk3mqyp5.fsf@gnu.org> References: <4C3D6B74.6030500@swipnet.se> Reply-To: Eli Zaretskii NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Transfer-Encoding: QUOTED-PRINTABLE X-Trace: dough.gmane.org 1279094668 29886 80.91.229.12 (14 Jul 2010 08:04:28 GMT) X-Complaints-To: usenet@dough.gmane.org NNTP-Posting-Date: Wed, 14 Jul 2010 08:04:28 +0000 (UTC) Cc: emacs-devel@gnu.org To: =?ISO-8859-1?Q?Jan_Dj=E4rv?= Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Wed Jul 14 10:04:27 2010 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([199.232.76.165]) by lo.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1OYwx7-0003ZC-Aw for ged-emacs-devel@m.gmane.org; Wed, 14 Jul 2010 10:04:25 +0200 Original-Received: from localhost ([127.0.0.1]:59549 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OYwx6-00060p-EA for ged-emacs-devel@m.gmane.org; Wed, 14 Jul 2010 04:04:24 -0400 Original-Received: from [140.186.70.92] (port=54357 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OYwx0-000605-Mx for emacs-devel@gnu.org; Wed, 14 Jul 2010 04:04:20 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1OYwwv-0003LE-Ue for emacs-devel@gnu.org; Wed, 14 Jul 2010 04:04:18 -0400 Original-Received: from mtaout21.012.net.il ([80.179.55.169]:64289) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1OYwwv-0003L6-Nw for emacs-devel@gnu.org; Wed, 14 Jul 2010 04:04:13 -0400 Original-Received: from conversion-daemon.a-mtaout21.012.net.il by a-mtaout21.012.net.il (HyperSendmail v2007.08) id <0L5J00900FLAC500@a-mtaout21.012.net.il> for emacs-devel@gnu.org; Wed, 14 Jul 2010 11:03:26 +0300 (IDT) Original-Received: from HOME-C4E4A596F7 ([77.127.120.144]) by a-mtaout21.012.net.il (HyperSendmail v2007.08) with ESMTPA id <0L5J003RRFPNU8E0@a-mtaout21.012.net.il>; Wed, 14 Jul 2010 11:03:24 +0300 (IDT) In-reply-to: <4C3D6B74.6030500@swipnet.se> X-012-Sender: halo1@inter.net.il X-detected-operating-system: by eggs.gnu.org: Solaris 10 (beta) X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Original-Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.devel:127259 Archived-At: > Date: Wed, 14 Jul 2010 09:47:00 +0200 > From: Jan Dj=E4rv >=20 > Now that trunk ia ANSI-C-ified, how shall emacs-23 commits that cha= nge=20 > prototypes or add functions be handeled? Shall we put them in emac= s-23 with=20 > P__ + K&R and then fix them in trunk when they get merged there, or= just=20 > 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.