From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: David Engster Newsgroups: gmane.emacs.devel Subject: Re: CEDET merge Date: Sat, 06 Oct 2012 19:29:15 +0200 Message-ID: <87626nbjbo.fsf@engster.org> References: <87fw6izq6z.fsf@gnu.org> <87obl6c7dj.fsf@engster.org> <87bogsedna.fsf_-_@engster.org> <87626vd380.fsf@engster.org> <87k3v6c9tf.fsf@engster.org> <871uhbrgob.fsf@gnu.org> <87lifjbzx3.fsf@engster.org> <87ipany8zi.fsf@gnu.org> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: ger.gmane.org 1349544566 11209 80.91.229.3 (6 Oct 2012 17:29:26 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sat, 6 Oct 2012 17:29:26 +0000 (UTC) Cc: Chong Yidong , emacs-devel@gnu.org, "Eric M. Ludlam" To: Stefan Monnier Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sat Oct 06 19:29:32 2012 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1TKYBt-0008Bo-Jw for ged-emacs-devel@m.gmane.org; Sat, 06 Oct 2012 19:29:29 +0200 Original-Received: from localhost ([::1]:54628 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TKYBn-0005nB-Is for ged-emacs-devel@m.gmane.org; Sat, 06 Oct 2012 13:29:23 -0400 Original-Received: from eggs.gnu.org ([208.118.235.92]:38427) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TKYBl-0005n6-Er for emacs-devel@gnu.org; Sat, 06 Oct 2012 13:29:22 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TKYBk-0007QY-Eb for emacs-devel@gnu.org; Sat, 06 Oct 2012 13:29:21 -0400 Original-Received: from randomsample.de ([83.169.19.17]:59439) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TKYBj-0007QI-Rk; Sat, 06 Oct 2012 13:29:20 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=randomsample.de; s=a; h=Content-Type:MIME-Version:Message-ID:Date:References:In-Reply-To:Subject:Cc:To:From; bh=D/vuUlzRNd2s1lZP1IYzign8O2+0QGklcFHqm7FPxcI=; b=IoJ+3Vg7tc9EaR0rTeziTxfNjGOr4hZey62tEQiQT0j8kPqXcxi8Vy1OIcRLe0efUngW5oRWxdPSVUFROlbiJ5kPAd0vefBKxU7Vio60jvO7X2PGZv+SIaG5gHLg5kqx; Original-Received: from dslc-082-083-058-203.pools.arcor-ip.net ([82.83.58.203] helo=spaten) by randomsample.de with esmtpsa (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.72) (envelope-from ) id 1TKYBg-000137-Sy; Sat, 06 Oct 2012 19:29:17 +0200 In-Reply-To: (Stefan Monnier's message of "Sat, 06 Oct 2012 10:54:55 -0400") User-Agent: Gnus/5.130006 (Ma Gnus v0.6) Emacs/24.1.50 (gnu/linux) Mail-Followup-To: Stefan Monnier , Chong Yidong , "Eric M. Ludlam" , emacs-devel@gnu.org X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 3) X-Received-From: 83.169.19.17 X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Original-Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.devel:154131 Archived-At: Stefan Monnier writes: >> By the way, could you or Eric kindly write up a NEWS entry briefly >> describing the major changes to CEDET since CEDET-1.0 / Emacs-24.2? > > I'm also interested to hear about how close we are to having Emacs's > CEDET and the upstream CEDET actually in sync (and kept in sync via > a semi-automatic process). Regarding the files which are both in Emacs and in CEDET: those are pretty much in sync now except for some compatibility code we have to keep for Emacs 23.1.. We also have some 'defadvice' hacks which we obviously cannot merge. For getting rid of the defadvices, some changes in Emacs core packages are needed, but I didn't have time to do that before the freeze (for example, getting proper help buffers for EIEIO classes and methods is pretty high on my TODO list). There are still some packages which are only in CEDET upstream for several reasons: They're either pretty new and not well tested, or are in our 'contrib' directory and don't have proper papers, or because they are a bit obscure (sorry Eric ;-) ) and well separated and hence would better fit into ELPA. For example, I think Cogre (for generating UML graphs) would be a good candidate for an ELPA package. Also, we now have two additional branches in CEDET for doing merges to and from Emacs; those are in fact "real" branches, meaning they have a common history, and after the first batch of humongous merges they work pretty painless now. The real work is in doing the 'diff|patch' thingy from Emacs to CEDET, but I've written a package for that which makes that fairly fast. All this should make it possible for me to do regular merges from now on, like the Gnus/Org people do. In addition, we are planning to move development of certain packages completely to Emacs trunk. We already did that for Speedbar; the next candidates are EIEIO and mode-local. -David