From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.ciao.gmane.io!not-for-mail From: Dmitry Gutov Newsgroups: gmane.emacs.bugs Subject: bug#41779: Fall back between vc-diff and diff-backup Date: Wed, 10 Jun 2020 22:05:35 +0300 Message-ID: References: <505E43E1.9090801@yandex.ru> <505E4A57.5020305@yandex.ru> <871rzer8t2.fsf@mail.linkov.net> <8d51a8c9-6200-84c9-cadb-09576b060fe1@yandex.ru> <87o92h7fv1.fsf@mail.linkov.net> <878stissii.fsf@mail.linkov.net> <87muhtzh8z.fsf@mail.linkov.net> <4538945a-4a47-e8a2-7c3b-485f229c0a98@yandex.ru> <871rz4qpni.fsf@mail.linkov.net> <87v9wdzc3g.fsf@mail.linkov.net> <87mu5b24ob.fsf_-_@mail.linkov.net> Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 7bit Injection-Info: ciao.gmane.io; posting-host="ciao.gmane.io:159.69.161.202"; logging-data="42237"; mail-complaints-to="usenet@ciao.gmane.io" User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.8.0 To: Juri Linkov , 41779@debbugs.gnu.org Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Wed Jun 10 21:07:48 2020 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane-mx.org Original-Received: from lists.gnu.org ([209.51.188.17]) by ciao.gmane.io with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1jj64i-000Atd-EK for geb-bug-gnu-emacs@m.gmane-mx.org; Wed, 10 Jun 2020 21:07:48 +0200 Original-Received: from localhost ([::1]:38538 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jj64h-0004jH-DA for geb-bug-gnu-emacs@m.gmane-mx.org; Wed, 10 Jun 2020 15:07:47 -0400 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:57424) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jj630-00031u-DR for bug-gnu-emacs@gnu.org; Wed, 10 Jun 2020 15:06:02 -0400 Original-Received: from debbugs.gnu.org ([209.51.188.43]:52066) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jj630-0006WV-2K for bug-gnu-emacs@gnu.org; Wed, 10 Jun 2020 15:06:02 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1jj62z-0000jX-SG for bug-gnu-emacs@gnu.org; Wed, 10 Jun 2020 15:06:01 -0400 X-Loop: help-debbugs@gnu.org Resent-From: Dmitry Gutov Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Wed, 10 Jun 2020 19:06:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 41779 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: patch Original-Received: via spool by 41779-submit@debbugs.gnu.org id=B41779.15918159462785 (code B ref 41779); Wed, 10 Jun 2020 19:06:01 +0000 Original-Received: (at 41779) by debbugs.gnu.org; 10 Jun 2020 19:05:46 +0000 Original-Received: from localhost ([127.0.0.1]:35377 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jj62j-0000ir-Ph for submit@debbugs.gnu.org; Wed, 10 Jun 2020 15:05:45 -0400 Original-Received: from mail-wr1-f44.google.com ([209.85.221.44]:42123) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jj62i-0000iW-9y for 41779@debbugs.gnu.org; Wed, 10 Jun 2020 15:05:44 -0400 Original-Received: by mail-wr1-f44.google.com with SMTP id p5so3524323wrw.9 for <41779@debbugs.gnu.org>; Wed, 10 Jun 2020 12:05:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:subject:to:references:from:message-id:date:user-agent :mime-version:in-reply-to:content-language:content-transfer-encoding; bh=I4rK+ul/fBRn1dNUmPPisZ3Jf2ztiIfEE74PAx3+2z4=; b=tw6tjSbyCGBr2FWRlSdtRwke7LcIXIQMv+I18D/bii09Fvs9bLKS4y8KaKyjvdqJcw mF5B0xf6wtYx58/V7UUhbrqsXkmM33Zd0jcVcsC292ixp9LTBjfhq8QxB/R6mx0Xt0I4 NMpQKoLs+8fVVYtUfr8S4P6WwRki1ywhuBsLbqmSbEO7PfiSJZqve1gPMcocnulopSmS j/1hQMp12uG90hXqdR6ZXl9oSA3LGcZ0y7ID9O06U2UnLnHs2YwV69298nJ49wqOPQjo RTaHo1jnr04MniA8Xx1yRd8UXh85C/aeaDOGXWhZBx1AjJrQfWjQK/eW9ohvtOojOXXy 1lQg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:subject:to:references:from:message-id :date:user-agent:mime-version:in-reply-to:content-language :content-transfer-encoding; bh=I4rK+ul/fBRn1dNUmPPisZ3Jf2ztiIfEE74PAx3+2z4=; b=X0EXO5TVKnfXG+nGHMOxN7Ru3/gIfoHAc+duQWIa+MbPc55PavvkRFlFLsclndLDlh WSUL6PC6XeMlfNKPNR+tYILNenuFuu898Qv8TqdC0lsx5814+ODEEhC25YXFhQUabfFo MqynS4ylmD/r2mIqH7pxAjnOEUSDopAaA9dZizprioT//MH+8Ss1BPkHZfhPY16G1uio 51lbvkgKkQJ6MXsnH5+JhkhTgfLgHJKnxH9/b4UgqBbQMA6GzM5BCWtf3783yHeMn2tp emPNRMLYtqVXX0O3vsmaw7V5SXCakX92vzc7eEobDebqOLVsXAU2GaJ9chszrMWyoqfT IG0Q== X-Gm-Message-State: AOAM5336dpVZue49G57byaNuAnEzDhST8jkOkbYgQ/sp29qR5XmHbS5z JIrWXUn0gImF7ammVGO7vzjJraX8 X-Google-Smtp-Source: ABdhPJwH+OKWtmcn+io2yUnbEZt++JkZreFXGPqCajdSc7RlJ8lpjCsO6Edl2PSox7IlQIsOotctpQ== X-Received: by 2002:a5d:5483:: with SMTP id h3mr5503276wrv.10.1591815937063; Wed, 10 Jun 2020 12:05:37 -0700 (PDT) Original-Received: from [192.168.0.3] ([66.205.73.129]) by smtp.googlemail.com with ESMTPSA id 5sm1544197wrr.5.2020.06.10.12.05.36 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Wed, 10 Jun 2020 12:05:36 -0700 (PDT) In-Reply-To: <87mu5b24ob.fsf_-_@mail.linkov.net> Content-Language: en-US X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: bug-gnu-emacs@gnu.org List-Id: "Bug reports for GNU Emacs, the Swiss army knife of text editors" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Original-Sender: "bug-gnu-emacs" Xref: news.gmane.io gmane.emacs.bugs:181827 Archived-At: On 10.06.2020 02:35, Juri Linkov wrote: > Therefore, this patch to the rescue: Considering that 'M-=' is not a default binding, and diff-backup doesn't have one, how about creating a new command? You could just as well bind it to 'M-='. The command could be called 'diff-dwim'. Or 'diff-vc-or-backup'. Regarding the proposed patch, I'm somewhat uneasy making 'vc-diff' (the command which purpose is to compare edits against the "saved" snapshot in version control) diff against the backup (lifetime of which is very unclear to me). Or vice versa.