From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Achim Gratz Newsgroups: gmane.emacs.devel Subject: Re: [PATCH] show difference when recovering file Date: Mon, 17 Dec 2012 18:35:24 +0100 Organization: Linux Private Site Message-ID: <87bodstwdf.fsf@Rainer.invalid> References: <877goi0wcz.fsf@kanis.fr> <871uep9ch3.fsf@googlemail.com> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: ger.gmane.org 1355765755 10016 80.91.229.3 (17 Dec 2012 17:35:55 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Mon, 17 Dec 2012 17:35:55 +0000 (UTC) To: emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Mon Dec 17 18:36:09 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 1Tkebo-0003kF-Ug for ged-emacs-devel@m.gmane.org; Mon, 17 Dec 2012 18:36:09 +0100 Original-Received: from localhost ([::1]:50890 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Tkebb-0004mv-IM for ged-emacs-devel@m.gmane.org; Mon, 17 Dec 2012 12:35:55 -0500 Original-Received: from eggs.gnu.org ([208.118.235.92]:42032) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TkebY-0004mA-Rw for emacs-devel@gnu.org; Mon, 17 Dec 2012 12:35:53 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TkebT-0001od-RK for emacs-devel@gnu.org; Mon, 17 Dec 2012 12:35:52 -0500 Original-Received: from plane.gmane.org ([80.91.229.3]:33433) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TkebT-0001oK-8e for emacs-devel@gnu.org; Mon, 17 Dec 2012 12:35:47 -0500 Original-Received: from list by plane.gmane.org with local (Exim 4.69) (envelope-from ) id 1TkebY-0003Y4-0z for emacs-devel@gnu.org; Mon, 17 Dec 2012 18:35:52 +0100 Original-Received: from pd9eb34e0.dip.t-dialin.net ([217.235.52.224]) by main.gmane.org with esmtp (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Mon, 17 Dec 2012 18:35:52 +0100 Original-Received: from Stromeko by pd9eb34e0.dip.t-dialin.net with local (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Mon, 17 Dec 2012 18:35:52 +0100 X-Injected-Via-Gmane: http://gmane.org/ Original-Lines: 17 Original-X-Complaints-To: usenet@ger.gmane.org X-Gmane-NNTP-Posting-Host: pd9eb34e0.dip.t-dialin.net User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.2.91 (gnu/linux) Cancel-Lock: sha1:03pH+gUkf+t0krGgaM4dfk0T+HI= X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 80.91.229.3 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:155622 Archived-At: Stefan Monnier writes: > Rather than always popping up a *diff* buffer, we could also change the > prompt from "yes/no" to "yes/no/diff". +1 Incidentally, this is how aptitude asks for your decision when a config file needs to replaced that has been edited locally. Regards, Achim. -- +<[Q+ Matrix-12 WAVE#46+305 Neuron microQkb Andromeda XTk Blofeld]>+ SD adaptation for Waldorf Blofeld V1.15B11: http://Synth.Stromeko.net/Downloads.html#WaldorfSDada