From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!.POSTED!not-for-mail From: Drew Adams Newsgroups: gmane.emacs.devel Subject: RE: Regarding smerge upper/lower; needs NEWS Date: Thu, 15 Mar 2018 12:44:28 -0700 (PDT) Message-ID: <60f7807d-1911-407e-9fbc-38a155d9cbfd@default> References: <833711qnos.fsf@gnu.org> <87sh91e09o.fsf@telefonica.net> <831sglqmz7.fsf@gnu.org> NNTP-Posting-Host: blaine.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: quoted-printable X-Trace: blaine.gmane.org 1521142962 29057 195.159.176.226 (15 Mar 2018 19:42:42 GMT) X-Complaints-To: usenet@blaine.gmane.org NNTP-Posting-Date: Thu, 15 Mar 2018 19:42:42 +0000 (UTC) To: Stefan Monnier , emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Thu Mar 15 20:42:38 2018 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by blaine.gmane.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ewYlp-0007Tz-Id for ged-emacs-devel@m.gmane.org; Thu, 15 Mar 2018 20:42:37 +0100 Original-Received: from localhost ([::1]:53118 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ewYns-0004qp-Bz for ged-emacs-devel@m.gmane.org; Thu, 15 Mar 2018 15:44:44 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:60133) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ewYnk-0004qX-J9 for emacs-devel@gnu.org; Thu, 15 Mar 2018 15:44:37 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ewYnh-0002pc-Gt for emacs-devel@gnu.org; Thu, 15 Mar 2018 15:44:36 -0400 Original-Received: from userp2120.oracle.com ([156.151.31.85]:39344) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1ewYnh-0002ow-6n for emacs-devel@gnu.org; Thu, 15 Mar 2018 15:44:33 -0400 Original-Received: from pps.filterd (userp2120.oracle.com [127.0.0.1]) by userp2120.oracle.com (8.16.0.22/8.16.0.22) with SMTP id w2FJN5Bh086762; Thu, 15 Mar 2018 19:44:31 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=mime-version : message-id : date : from : sender : to : subject : references : in-reply-to : content-type : content-transfer-encoding; s=corp-2017-10-26; bh=VKjhqpCirj0sjeg5aOCr8m6JEC14Gwm862tnJsIVlbY=; b=JY7otmnhRppiWumP3ej2fuVfRE9+NdQyiBLfOrw6BvqQItRde3/2QBqkhJ8s8dtSvhEB uvnPPgZEERYcBzUP+DB2RmzEBRiZSCt0jSDarzXd4SrIQj0zfstgf0pUhEBu4u0VnEg1 2lKDiEWRGL5zuHNAm5IMXDAPZGxs9H/YoEdkKuUHtlQSOP/4jY+9dsQYRKDEQ4nbEwcv E7kMPkCU12EA/qJwJuc7/LpJQ2t7UzwL/YIcjzHi6JJ6XBmZzMLOaMr4x+i7BJSAh2FG DInSrxDqDmQbxDGTJiG/uusvPAc1phw5g0NHXO6fhmp9rFX401D7e9FStbiF5daOXyt7 IQ== Original-Received: from aserv0021.oracle.com (aserv0021.oracle.com [141.146.126.233]) by userp2120.oracle.com with ESMTP id 2gqxxj82s4-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 15 Mar 2018 19:44:31 +0000 Original-Received: from aserv0121.oracle.com (aserv0121.oracle.com [141.146.126.235]) by aserv0021.oracle.com (8.14.4/8.14.4) with ESMTP id w2FJiUUh005824 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 15 Mar 2018 19:44:30 GMT Original-Received: from abhmp0017.oracle.com (abhmp0017.oracle.com [141.146.116.23]) by aserv0121.oracle.com (8.14.4/8.13.8) with ESMTP id w2FJiToc024692; Thu, 15 Mar 2018 19:44:30 GMT In-Reply-To: X-Priority: 3 X-Mailer: Oracle Beehive Extensions for Outlook 2.0.1.9.1 (1003210) [OL 16.0.4666.0 (x86)] X-Proofpoint-Virus-Version: vendor=nai engine=5900 definitions=8832 signatures=668690 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 suspectscore=0 malwarescore=0 phishscore=0 bulkscore=0 spamscore=0 mlxscore=0 mlxlogscore=604 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1711220000 definitions=main-1803150169 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [generic] [fuzzy] X-Received-From: 156.151.31.85 X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.21 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" Xref: news.gmane.org gmane.emacs.devel:223762 Archived-At: > > but if the windows/buffers are labeled, as is done in Ediff ("A", "B") > > then there is no ambiguity, regardless of how or where they might > > be displayed. >=20 > Check the subject: it says "smerge". That's a minor mode which operates > 100% within a buffer (any buffer), so there's no labeling of buffer or > window involved. If you don't have some visible object to label then use the label of the existing visible thing you have. E.g., if the only visible distinction is the use of different faces then use the face names. Users can at least use `C-u C-x =3D' to see what those are, if the names are not clear. (But if the names are not clear then maybe a renaming is in order.)