From mboxrd@z Thu Jan 1 00:00:00 1970 Path: main.gmane.org!not-for-mail From: Richard Stallman Newsgroups: gmane.emacs.devel Subject: Re: 4 minor suggestions for files.el Date: Wed, 07 May 2003 07:50:40 -0400 Sender: emacs-devel-bounces+emacs-devel=quimby.gnus.org@gnu.org Message-ID: References: <200304142022.h3EKMHRu026814@rum.cs.yale.edu> <200304172139.h3HLdBvK009948@rum.cs.yale.edu> <200304292107.h3TL7Kl9007427@rum.cs.yale.edu> <1052146332.510.27.camel@localhost> <200305061300.h46D03jk011242@rum.cs.yale.edu> Reply-To: rms@gnu.org NNTP-Posting-Host: main.gmane.org X-Trace: main.gmane.org 1052308439 5417 80.91.224.249 (7 May 2003 11:53:59 GMT) X-Complaints-To: usenet@main.gmane.org NNTP-Posting-Date: Wed, 7 May 2003 11:53:59 +0000 (UTC) Cc: monnier+gnu/emacs@rum.cs.yale.edu Original-X-From: emacs-devel-bounces+emacs-devel=quimby.gnus.org@gnu.org Wed May 07 13:53:45 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 19DNUX-0001OD-00 for ; Wed, 07 May 2003 13:53:45 +0200 Original-Received: from monty-python.gnu.org ([199.232.76.173]) by quimby.gnus.org with esmtp (Exim 3.12 #1 (Debian)) id 19DNYV-0002rW-00 for ; Wed, 07 May 2003 13:57:51 +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 19DNUB-0008WD-0D for emacs-devel@quimby.gnus.org; Wed, 07 May 2003 07:53:23 -0400 Original-Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.10.13) id 19DNTH-0007t1-00 for emacs-devel@gnu.org; Wed, 07 May 2003 07:52:27 -0400 Original-Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.10.13) id 19DNSZ-00075g-00 for emacs-devel@gnu.org; Wed, 07 May 2003 07:51:43 -0400 Original-Received: from fencepost.gnu.org ([199.232.76.164]) by monty-python.gnu.org with esmtp (Exim 4.10.13) id 19DNRY-0006nW-00 for emacs-devel@gnu.org; Wed, 07 May 2003 07:50:40 -0400 Original-Received: from rms by fencepost.gnu.org with local (Exim 4.10) id 19DNRY-0004Kw-00; Wed, 07 May 2003 07:50:40 -0400 Original-To: "Stefan Monnier" In-reply-to: <200305061300.h46D03jk011242@rum.cs.yale.edu> (monnier+gnu/emacs@rum.cs.yale.edu) Original-cc: spiegel@gnu.org 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:13733 X-Report-Spam: http://spam.gmane.org/gmane.emacs.devel:13733 > 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. Perhaps we should make your change, but do it as an option, not unconditionally. Then we could make vc-merge specify that option.