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: Mon, 01 Oct 2012 17:17:29 +0200 Message-ID: <87wqzab4s6.fsf@engster.org> References: <87fw6izq6z.fsf@gnu.org> <87obl6c7dj.fsf@engster.org> <87bogsedna.fsf_-_@engster.org> <87626vd380.fsf@engster.org> <87mx06svos.fsf@gnu.org> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: ger.gmane.org 1349104715 26052 80.91.229.3 (1 Oct 2012 15:18:35 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Mon, 1 Oct 2012 15:18:35 +0000 (UTC) Cc: "Eric M. Ludlam" , emacs-devel@gnu.org To: Chong Yidong Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Mon Oct 01 17:18:39 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 1TIhlF-0006Wo-JQ for ged-emacs-devel@m.gmane.org; Mon, 01 Oct 2012 17:18:21 +0200 Original-Received: from localhost ([::1]:33591 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TIhlA-0006t2-1Y for ged-emacs-devel@m.gmane.org; Mon, 01 Oct 2012 11:18:16 -0400 Original-Received: from eggs.gnu.org ([208.118.235.92]:58077) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TIhke-0006mm-UT for emacs-devel@gnu.org; Mon, 01 Oct 2012 11:18:14 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TIhkD-0005Lk-4E for emacs-devel@gnu.org; Mon, 01 Oct 2012 11:17:44 -0400 Original-Received: from randomsample.de ([83.169.19.17]:36411) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TIhkC-0005F2-OI; Mon, 01 Oct 2012 11:17:17 -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=6LX3m2Lsd7fkf+CM+D0olB8wQ8TCSvIjTHFS5ucC+KY=; b=giuELj1XmPpnSL/+epSg6Ru66PN50e9H6SFsrpuQuU9Exv+nsQ+gc7sw4OYjcDj811pYD1fNfZwwK6fuGT3A8D2nA8T9km8TeAKoO/i4gtoPFRDXcsY7d/iWChLv4BWX; Original-Received: from dslc-082-083-050-129.pools.arcor-ip.net ([82.83.50.129] helo=spaten) by randomsample.de with esmtpsa (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.72) (envelope-from ) id 1TIhk4-0003Wz-Pk; Mon, 01 Oct 2012 17:17:09 +0200 In-Reply-To: <87mx06svos.fsf@gnu.org> (Chong Yidong's message of "Mon, 01 Oct 2012 11:44:19 +0800") User-Agent: Gnus/5.130006 (Ma Gnus v0.6) Emacs/24.1.50 (gnu/linux) Mail-Followup-To: Chong Yidong , emacs-devel@gnu.org, "Eric M. Ludlam" 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:153838 Archived-At: Chong Yidong writes: > David Engster writes: > >> I've checked the new code base with our test suite and fixed a bunch of >> stuff. Everything's working now except for a few minor things, so I >> think the branch is now ready for merging. >> >> You can obtain a patch file from our 'to-emacs' branch (for details see >> my last mail), but I've also attached it to this message so everyone can >> check it easily. There's no ChangeLog yet, so if you want to check the >> logs you still need our 'to-emacs' branch. > > OK, I will perform the merge soon. Thanks for all your work. Unfortunately, I see now that I forgot to remove some defadvices. After applying the patch, please remove the two defadvices for hideif from semantic/bovine/c.el. We have to see if we somehow can implement this feature using hooks, or maybe we have to remove the semantical hideif-feature altogether. Also, I merged lots of stuff from senator.el (including some defadvices) which shouldn't land in Emacs. So for now, I would suggest to simply revert senator.el after the patch is applied. I think Eric wanted to remove senator.el at some point in time, but I guess we don't have a good replacement yet...? -David