From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Stefan Monnier Newsgroups: gmane.emacs.devel Subject: Re: smerge-ediff "MINE" and "OTHER" monikers unhelpful Date: Mon, 25 Nov 2013 10:40:51 -0500 Message-ID: References: <87zjowpn2s.fsf@fencepost.gnu.org> <87a9gvnreg.fsf@fencepost.gnu.org> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: ger.gmane.org 1385394080 13771 80.91.229.3 (25 Nov 2013 15:41:20 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Mon, 25 Nov 2013 15:41:20 +0000 (UTC) Cc: emacs-devel@gnu.org To: David Kastrup Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Mon Nov 25 16:41:22 2013 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 1VkyHq-0004x9-Dq for ged-emacs-devel@m.gmane.org; Mon, 25 Nov 2013 16:41:22 +0100 Original-Received: from localhost ([::1]:53383 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VkyHq-0000VX-0v for ged-emacs-devel@m.gmane.org; Mon, 25 Nov 2013 10:41:22 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:52608) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VkyHb-0000Ls-AA for emacs-devel@gnu.org; Mon, 25 Nov 2013 10:41:14 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VkyHU-00048f-1J for emacs-devel@gnu.org; Mon, 25 Nov 2013 10:41:07 -0500 Original-Received: from ironport2-out.teksavvy.com ([206.248.154.181]:1337) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VkyHM-00046z-E1; Mon, 25 Nov 2013 10:40:52 -0500 X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: Av4EABK/CFFFxIQK/2dsb2JhbABEvw4Xc4IeAQEEAVYjBQsLDiYSFBgNJIgeBsEtkQoDiGGcGYFegxU X-IPAS-Result: Av4EABK/CFFFxIQK/2dsb2JhbABEvw4Xc4IeAQEEAVYjBQsLDiYSFBgNJIgeBsEtkQoDiGGcGYFegxU X-IronPort-AV: E=Sophos;i="4.84,565,1355115600"; d="scan'208";a="40344458" Original-Received: from 69-196-132-10.dsl.teksavvy.com (HELO pastel.home) ([69.196.132.10]) by ironport2-out.teksavvy.com with ESMTP/TLS/ADH-AES256-SHA; 25 Nov 2013 10:40:51 -0500 Original-Received: by pastel.home (Postfix, from userid 20848) id 48756603C3; Mon, 25 Nov 2013 10:40:51 -0500 (EST) In-Reply-To: <87a9gvnreg.fsf@fencepost.gnu.org> (David Kastrup's message of "Sat, 23 Nov 2013 15:07:03 +0100") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.3.50 (gnu/linux) X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 206.248.154.181 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:165702 Archived-At: > At any rate, this is what I went with. Feel free to take it; I have a > copyright assignment for Emacs on file. Installed with minor tweaks, thank you, Stefan