From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Christoph Scholtes Newsgroups: gmane.emacs.devel Subject: Re: New function: vc-ediff Date: Thu, 10 Mar 2011 21:38:14 -0700 Message-ID: <4D79A736.6080707@gmail.com> References: <4D785193.3030201@gmail.com> NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit X-Trace: dough.gmane.org 1299818311 12000 80.91.229.12 (11 Mar 2011 04:38:31 GMT) X-Complaints-To: usenet@dough.gmane.org NNTP-Posting-Date: Fri, 11 Mar 2011 04:38:31 +0000 (UTC) Cc: emacs-devel@gnu.org To: Stefan Monnier Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Fri Mar 11 05:38:26 2011 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 1Pxu7M-0007Dl-TL for ged-emacs-devel@m.gmane.org; Fri, 11 Mar 2011 05:38:25 +0100 Original-Received: from localhost ([127.0.0.1]:49319 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Pxu7M-0003Bf-GL for ged-emacs-devel@m.gmane.org; Thu, 10 Mar 2011 23:38:24 -0500 Original-Received: from [140.186.70.92] (port=37951 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Pxu7I-0003BV-Iw for emacs-devel@gnu.org; Thu, 10 Mar 2011 23:38:21 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Pxu7H-00077G-DP for emacs-devel@gnu.org; Thu, 10 Mar 2011 23:38:20 -0500 Original-Received: from mail-yw0-f41.google.com ([209.85.213.41]:60188) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Pxu7H-00076q-9Z for emacs-devel@gnu.org; Thu, 10 Mar 2011 23:38:19 -0500 Original-Received: by yws5 with SMTP id 5so1319467yws.0 for ; Thu, 10 Mar 2011 20:38:18 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlemail.com; s=gamma; h=domainkey-signature:message-id:date:from:user-agent:mime-version:to :cc:subject:references:in-reply-to:content-type :content-transfer-encoding; bh=/HcCaG3mwGnp2j82ANeDECiVKdqYwBSFLdZloS+ML+o=; b=h0aaOJLl7lxgxvLy7i+KSKa0gWiMJxK+OMStc6ogv/f5UklPkpSp/LdQfaKkrtN5eR DLj7Rr7XxXssg5wxBlgKb70Y+tHchffYcVLhXinT11EuVz4SFRhl7PXjc7NHtQFbAzFv WUSlZJ2XGREryRt7qAL6wGOyUVvf/2qZ0+VvA= DomainKey-Signature: a=rsa-sha1; c=nofws; d=googlemail.com; s=gamma; h=message-id:date:from:user-agent:mime-version:to:cc:subject :references:in-reply-to:content-type:content-transfer-encoding; b=f7hhjU6Dcs5bewy0TfqTnZDNzLPUexOQ/0vetNJdAmw5YQHNhtgozyiPny2p63ul+u dlsmiXPzelaawzWchfEaCcwWmsSm8anufs/PVq2VBZ9l0OA3f+pQhkU6OzLxOhRGZsub ruYxz9Dy7CEk49X7YZZp6mn0MokC8csnDuaI0= Original-Received: by 10.146.26.23 with SMTP id 23mr13267139yaz.33.1299818298239; Thu, 10 Mar 2011 20:38:18 -0800 (PST) Original-Received: from [192.168.1.5] (71-208-131-84.hlrn.qwest.net [71.208.131.84]) by mx.google.com with ESMTPS id x31sm2475701ana.29.2011.03.10.20.38.16 (version=SSLv3 cipher=OTHER); Thu, 10 Mar 2011 20:38:17 -0800 (PST) User-Agent: Mozilla/5.0 (Windows; U; Windows NT 6.1; en-US; rv:1.9.2.15) Gecko/20110303 Thunderbird/3.1.9 In-Reply-To: X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) X-Received-From: 209.85.213.41 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:137079 Archived-At: Hi Stefan, On 3/10/2011 9:00 AM, Stefan Monnier wrote: > I think vc-ediff should not require any changes to ediff. > You can check pcvs.el for an example of code that provides similar > functionality without any ediff changes. I saw that, but I honestly didn't like this implementation. I felt using `ediff-buffers' I would need to duplicate code that had already been written, namely in `ediff-revision'. I figured, what I needed for 'vc-diff' is basically `ediff-revision', but without the interactive prompts for revisions. Unfortunately, the function does not work that way. So I factored out the interactive piece from the piece I would need for `vc-ediff'. The refactoring in `ediff.el' is minimal just exposes an internal, non-interactive function for other functions besides `ediff-revision' to use. Ultimately, `ediff-(vc|rcs)-internal', which is called by `ediff-revision', uses `ediff-buffers', like the implementation in `pcvs.el'. Is there any specific reason why the refactoring in `ediff.el' should not be done? Christoph