From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Chong Yidong Newsgroups: gmane.emacs.devel Subject: Re: CEDET merge Date: Tue, 02 Oct 2012 01:56:26 +0800 Message-ID: <87bogm13g5.fsf@gnu.org> References: <87fw6izq6z.fsf@gnu.org> <87obl6c7dj.fsf@engster.org> <87bogsedna.fsf_-_@engster.org> <87626vd380.fsf@engster.org> <87mx06svos.fsf@gnu.org> <87wqzab4s6.fsf@engster.org> <87r4piytfe.fsf@gnu.org> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: ger.gmane.org 1349114249 19496 80.91.229.3 (1 Oct 2012 17:57:29 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Mon, 1 Oct 2012 17:57:29 +0000 (UTC) Cc: "Eric M. Ludlam" To: emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Mon Oct 01 19:57:30 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 1TIkET-0008Cf-Cp for ged-emacs-devel@m.gmane.org; Mon, 01 Oct 2012 19:56:41 +0200 Original-Received: from localhost ([::1]:50172 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TIkEN-0006e9-Qj for ged-emacs-devel@m.gmane.org; Mon, 01 Oct 2012 13:56:35 -0400 Original-Received: from eggs.gnu.org ([208.118.235.92]:48053) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TIkEL-0006dr-A4 for emacs-devel@gnu.org; Mon, 01 Oct 2012 13:56:34 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TIkEK-0002Oj-DB for emacs-devel@gnu.org; Mon, 01 Oct 2012 13:56:33 -0400 Original-Received: from mail-pb0-f41.google.com ([209.85.160.41]:41994) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TIkEK-0002Od-6o for emacs-devel@gnu.org; Mon, 01 Oct 2012 13:56:32 -0400 Original-Received: by pbbrq2 with SMTP id rq2so8613860pbb.0 for ; Mon, 01 Oct 2012 10:56:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:references:date:in-reply-to:message-id :user-agent:mime-version:content-type; bh=m954MJo7YTTcw71jwCrB5s2tr3mw73QSmywEDFoR618=; b=TVEWAWM5kMMQEIIUgLcy2nlpecCf2tX6+qgMK2ahBQcXeuM2MUW2Ips4XmmP5uiFbQ RagWelnJu2Robo8l3bAYOz9eS1EulMGBL7XBlWQxbHYl82pWhYMPq3yhStNn9No5Ehm6 V7zdW/89pjk+RjaU+2uJIv8XOImRYsJalo5iBx4d/r47Io0pk9vNMwiHzLlgwyWkVq0T xxKtcrGyJURQNZxSAH6wBaQaaS9ge7Mg26IIiffk/nZAu1usbJdKZuKpO8qvOiUUipF7 zICbVV1pOI84IgiggIqtJWppCago0G0VtlVP6CDyfqE4EhcUeP9A8gDkV2aHiZSrqAcF qzAQ== Original-Received: by 10.68.221.70 with SMTP id qc6mr43601555pbc.92.1349114191215; Mon, 01 Oct 2012 10:56:31 -0700 (PDT) Original-Received: from ulysses ([155.69.184.76]) by mx.google.com with ESMTPS id gt2sm10598826pbc.62.2012.10.01.10.56.28 (version=SSLv3 cipher=OTHER); Mon, 01 Oct 2012 10:56:30 -0700 (PDT) In-Reply-To: <87r4piytfe.fsf@gnu.org> (Chong Yidong's message of "Tue, 02 Oct 2012 01:48:53 +0800") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.2.50 (gnu/linux) X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 209.85.160.41 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:153865 Archived-At: Chong Yidong writes: > I've done the merge, omitting senator and the defadvices as you > suggested. Actually, I seem to be having uploading to bzr right now. If it doesn't go through tonight, I'll try again tomorrow.