From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!.POSTED.blaine.gmane.org!not-for-mail From: charles@aurox.ch (Charles A. Roelli) Newsgroups: gmane.emacs.bugs Subject: bug#32991: 27.0.50; diff-auto-refine-mode a no-op Date: Sun, 03 Feb 2019 12:42:24 +0100 Message-ID: References: <87sgx9n9gp.fsf@mail.linkov.net> Reply-To: charles@aurox.ch Injection-Info: blaine.gmane.org; posting-host="blaine.gmane.org:195.159.176.226"; logging-data="260463"; mail-complaints-to="usenet@blaine.gmane.org" Cc: 32991@debbugs.gnu.org, juri@linkov.net To: Stefan Monnier Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Sun Feb 03 12:35:52 2019 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane.org Original-Received: from lists.gnu.org ([209.51.188.17]) by blaine.gmane.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:256) (Exim 4.89) (envelope-from ) id 1gqG3z-0015do-5B for geb-bug-gnu-emacs@m.gmane.org; Sun, 03 Feb 2019 12:35:51 +0100 Original-Received: from localhost ([127.0.0.1]:54363 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gqG3y-00064F-1z for geb-bug-gnu-emacs@m.gmane.org; Sun, 03 Feb 2019 06:35:50 -0500 Original-Received: from eggs.gnu.org ([209.51.188.92]:59394) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gqG3m-00063d-9y for bug-gnu-emacs@gnu.org; Sun, 03 Feb 2019 06:35:39 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gqG2F-0000qW-0V for bug-gnu-emacs@gnu.org; Sun, 03 Feb 2019 06:34:03 -0500 Original-Received: from debbugs.gnu.org ([209.51.188.43]:57480) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gqG2E-0000q6-Jy for bug-gnu-emacs@gnu.org; Sun, 03 Feb 2019 06:34:02 -0500 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1gqG2E-0004sz-DD for bug-gnu-emacs@gnu.org; Sun, 03 Feb 2019 06:34:02 -0500 X-Loop: help-debbugs@gnu.org Resent-From: charles@aurox.ch (Charles A. Roelli) Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Sun, 03 Feb 2019 11:34:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 32991 X-GNU-PR-Package: emacs Original-Received: via spool by 32991-submit@debbugs.gnu.org id=B32991.154919360418729 (code B ref 32991); Sun, 03 Feb 2019 11:34:02 +0000 Original-Received: (at 32991) by debbugs.gnu.org; 3 Feb 2019 11:33:24 +0000 Original-Received: from localhost ([127.0.0.1]:56761 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1gqG1b-0004s0-Uw for submit@debbugs.gnu.org; Sun, 03 Feb 2019 06:33:24 -0500 Original-Received: from sinyavsky.aurox.ch ([37.35.109.145]:33107) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1gqG1Z-0004ri-Lc for 32991@debbugs.gnu.org; Sun, 03 Feb 2019 06:33:22 -0500 Original-Received: from sinyavsky.aurox.ch (sinyavsky.aurox.ch [127.0.0.1]) by sinyavsky.aurox.ch (Postfix) with ESMTP id 437A822A4B for <32991@debbugs.gnu.org>; Sun, 3 Feb 2019 11:39:15 +0000 (UTC) Authentication-Results: sinyavsky.aurox.ch (amavisd-new); dkim=pass reason="pass (just generated, assumed good)" header.d=aurox.ch DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=aurox.ch; h= references:reply-to:subject:subject:in-reply-to:to:from:from :message-id:date:date; s=dkim; t=1549193952; x=1550057953; bh=XW QM6NDrjE+xaZcempm74o6xw5slk3h+h2/AGvSZwNE=; b=aS+gsvttJLw2l4wa/J s3QpGb66zvA7WVzE3ka2eyI4ov6809Sj7xjQKmrsbNG+LG035alKn/gIaJeHbUbA He9WvXxPSocx5Sk+2KFwwvlXvCVg9GMBB+NffIrmluKv5nOlE3XpJAvOW23vP5uh TQbOIAhagtJCiWnCAF3aWtfNA= X-Virus-Scanned: Debian amavisd-new at test.virtualizor.com Original-Received: from sinyavsky.aurox.ch ([127.0.0.1]) by sinyavsky.aurox.ch (sinyavsky.aurox.ch [127.0.0.1]) (amavisd-new, port 10026) with ESMTP id 96Xxm2VRxQKp for <32991@debbugs.gnu.org>; Sun, 3 Feb 2019 11:39:12 +0000 (UTC) Original-Received: from gray (unknown [IPv6:2a02:1206:4519:d090:c62c:3ff:fe30:b864]) by sinyavsky.aurox.ch (Postfix) with ESMTPSA id EEB7822832; Sun, 3 Feb 2019 11:39:08 +0000 (UTC) In-reply-to: (message from Stefan Monnier on Fri, 01 Feb 2019 02:38:51 -0500) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.51.188.43 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.org@gnu.org Original-Sender: "bug-gnu-emacs" Xref: news.gmane.org gmane.emacs.bugs:155046 Archived-At: > From: Stefan Monnier > Date: Fri, 01 Feb 2019 02:38:51 -0500 > > > A similar option `font-lock` also makes sense for a new > > customizable variable with a name like `smerge-refine` > > that could automatically refine all smerge conflicts. > > FWIW, here's the reason why I haven't even looked into doing it > automatically for smerge: IMO 2-way conflicts are worthless so I only > care about 3-way conflicts, and for those I don't know how to display > all 3 different "refinements" at the same time. IOW I too often need to > use the cycling behavior of smerge-refine for a "font-lock" version to > be sufficient. So if we implement a "font-lock" version of > smerge-refine, we'll need to make sure it interacts well with subsequent > manual smerge-refine cycling. Why are 2-way conflicts worthless? Automatically refining them could be helpful in some situations. By the way, does the updated change I sent in https://debbugs.gnu.org/cgi/bugreport.cgi?bug=32991#38 look okay to you?