From mboxrd@z Thu Jan 1 00:00:00 1970 Path: main.gmane.org!not-for-mail From: "Stefan Monnier" Newsgroups: gmane.emacs.devel Subject: Re: 4 minor suggestions for files.el Date: Tue, 06 May 2003 09:00:03 -0400 Sender: emacs-devel-bounces+emacs-devel=quimby.gnus.org@gnu.org Message-ID: <200305061300.h46D03jk011242@rum.cs.yale.edu> References: <200304142022.h3EKMHRu026814@rum.cs.yale.edu> <200304172139.h3HLdBvK009948@rum.cs.yale.edu> <200304292107.h3TL7Kl9007427@rum.cs.yale.edu> <1052146332.510.27.camel@localhost> NNTP-Posting-Host: main.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Trace: main.gmane.org 1052226717 12643 80.91.224.249 (6 May 2003 13:11:57 GMT) X-Complaints-To: usenet@main.gmane.org NNTP-Posting-Date: Tue, 6 May 2003 13:11:57 +0000 (UTC) Cc: monnier+gnu/emacs@rum.cs.yale.edu Original-X-From: emacs-devel-bounces+emacs-devel=quimby.gnus.org@gnu.org Tue May 06 15:11:52 2003 Return-path: Original-Received: from quimby.gnus.org ([80.91.224.244]) by main.gmane.org with esmtp (Exim 3.35 #1 (Debian)) id 19D27y-0002mp-00 for ; Tue, 06 May 2003 15:05:02 +0200 Original-Received: from monty-python.gnu.org ([199.232.76.173]) by quimby.gnus.org with esmtp (Exim 3.12 #1 (Debian)) id 19D2BT-0006aj-00 for ; Tue, 06 May 2003 15:08:39 +0200 Original-Received: from localhost ([127.0.0.1] helo=monty-python.gnu.org) by monty-python.gnu.org with esmtp (Exim 4.10.13) id 19D275-00035E-00 for emacs-devel@quimby.gnus.org; Tue, 06 May 2003 09:04:07 -0400 Original-Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.10.13) id 19D25e-0002PH-00 for emacs-devel@gnu.org; Tue, 06 May 2003 09:02:38 -0400 Original-Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.10.13) id 19D23K-0001lU-00 for emacs-devel@gnu.org; Tue, 06 May 2003 09:00:16 -0400 Original-Received: from rum.cs.yale.edu ([128.36.229.169]) by monty-python.gnu.org with esmtp (Exim 4.10.13) id 19D23A-0001cx-00; Tue, 06 May 2003 09:00:04 -0400 Original-Received: from rum.cs.yale.edu (localhost [127.0.0.1]) by rum.cs.yale.edu (8.12.8/8.12.8) with ESMTP id h46D03x6011244; Tue, 6 May 2003 09:00:04 -0400 Original-Received: (from monnier@localhost) by rum.cs.yale.edu (8.12.8/8.12.8/Submit) id h46D03jk011242; Tue, 6 May 2003 09:00:03 -0400 X-Mailer: exmh version 2.4 06/23/2000 with nmh-1.0.4 Original-To: Richard Stallman Original-cc: Andre Spiegel Original-cc: emacs-devel@gnu.org X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1b5 Precedence: list List-Id: Emacs development discussions. List-Help: List-Post: List-Subscribe: , List-Archive: List-Unsubscribe: , Errors-To: emacs-devel-bounces+emacs-devel=quimby.gnus.org@gnu.org Xref: main.gmane.org gmane.emacs.devel:13720 X-Report-Spam: http://spam.gmane.org/gmane.emacs.devel:13720 > We already have that. vc-merge (C-x v m) can do it; just specify the > version numbers in reverse. E.g. typing C-x v m 1.4 RET 1.2 RET takes > out the changes that were made from version 1.2 to 1.4. > > (I didn't know about vc-merge.) > > For vc-merge, since that is an explicit command to apply a patch to > the buffer, I think it would be right for the patch to be undoable. > Is it undoable now? No. > Could it be made so? Would that require a change > somewhat like the one Stefan proposed? Yes, indeed. My suggested change indeed allows the change to be undone. The reason is the following: vc-merge works on the file rather than on the buffer, so after the merge happens, VC does a revert-buffer (unless the buffer was modified), so my suggested change allows you to undo it because it can undo the revert-buffer. Stefan