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: Wed, 07 May 2003 10:26:12 -0400 Sender: emacs-devel-bounces+emacs-devel=quimby.gnus.org@gnu.org Message-ID: <200305071426.h47EQCEv014664@rum.cs.yale.edu> References: <200304142022.h3EKMHRu026814@rum.cs.yale.edu> <200304172139.h3HLdBvK009948@rum.cs.yale.edu> <200304292107.h3TL7Kl9007427@rum.cs.yale.edu> <1052310679.6399.34.camel@localhost> NNTP-Posting-Host: main.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Trace: main.gmane.org 1052317790 22249 80.91.224.249 (7 May 2003 14:29:50 GMT) X-Complaints-To: usenet@main.gmane.org NNTP-Posting-Date: Wed, 7 May 2003 14:29:50 +0000 (UTC) Cc: emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+emacs-devel=quimby.gnus.org@gnu.org Wed May 07 16:29:48 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 19DPuQ-0005gA-00 for ; Wed, 07 May 2003 16:28:38 +0200 Original-Received: from monty-python.gnu.org ([199.232.76.173]) by quimby.gnus.org with esmtp (Exim 3.12 #1 (Debian)) id 19DPyR-0004QC-00 for ; Wed, 07 May 2003 16:32:47 +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 19DPsR-0008La-06 for emacs-devel@quimby.gnus.org; Wed, 07 May 2003 10:26:35 -0400 Original-Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.10.13) id 19DPs8-0008Kz-00 for emacs-devel@gnu.org; Wed, 07 May 2003 10:26:16 -0400 Original-Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.10.13) id 19DPs6-0008KV-00 for emacs-devel@gnu.org; Wed, 07 May 2003 10:26:15 -0400 Original-Received: from rum.cs.yale.edu ([128.36.229.169]) by monty-python.gnu.org with esmtp (Exim 4.10.13) id 19DPs4-0008Jm-00; Wed, 07 May 2003 10:26:12 -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 h47EQCx6014666; Wed, 7 May 2003 10:26:12 -0400 Original-Received: (from monnier@localhost) by rum.cs.yale.edu (8.12.8/8.12.8/Submit) id h47EQCEv014664; Wed, 7 May 2003 10:26:12 -0400 X-Mailer: exmh version 2.4 06/23/2000 with nmh-1.0.4 Original-To: Andre Spiegel Original-cc: rms@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:13743 X-Report-Spam: http://spam.gmane.org/gmane.emacs.devel:13743 > > I don't think it's wise to make this available through the general undo > > mechanism. For example, vc-merge may also detect conflicts with your > > own changes, and you need to resolve them before the merge operation is > > actually finished. How would you undo that? > > > > I presume you would resolve them through editing, so I guess you > > could undo those editing operations. Would that be unreasonable? > > Conflict resolution works by invoking smerge-mode or ediff after the > merge operation, automatically. If we follow the undo path, we ought to > make sure what the interactions will be with these mechanisms. I don't understand the question: `undo' is a normal editing operation, just like any other, and smerge also doesn't do anything special about the way it edits the buffer. So they just interact in the obvious and expected way. The only thing that might be relevant is that if you resolve the last conflict and turn off smerge-mode, undoing the last change won't automatically turn smerge-mode back on. It would be nice to improve this, but it's really not that important. Stefan