From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!.POSTED!not-for-mail From: Philipp Stephani Newsgroups: gmane.emacs.bugs Subject: bug#25493: 26.0.50; ediff merge should (optionally) show ancestor in fourth window Date: Fri, 20 Jan 2017 12:17:46 +0100 Message-ID: NNTP-Posting-Host: blaine.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Trace: blaine.gmane.org 1484911156 21484 195.159.176.226 (20 Jan 2017 11:19:16 GMT) X-Complaints-To: usenet@blaine.gmane.org NNTP-Posting-Date: Fri, 20 Jan 2017 11:19:16 +0000 (UTC) To: 25493@debbugs.gnu.org Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Fri Jan 20 12:19:10 2017 Return-path: Envelope-to: geb-bug-gnu-emacs@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 1cUXDm-0004cv-Un for geb-bug-gnu-emacs@m.gmane.org; Fri, 20 Jan 2017 12:19:07 +0100 Original-Received: from localhost ([::1]:53781 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cUXDp-0001ba-Om for geb-bug-gnu-emacs@m.gmane.org; Fri, 20 Jan 2017 06:19:09 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:54363) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cUXDj-0001bT-MH for bug-gnu-emacs@gnu.org; Fri, 20 Jan 2017 06:19:04 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cUXDi-0000Nh-9m for bug-gnu-emacs@gnu.org; Fri, 20 Jan 2017 06:19:03 -0500 Original-Received: from debbugs.gnu.org ([208.118.235.43]:37859) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1cUXDi-0000Nd-5g for bug-gnu-emacs@gnu.org; Fri, 20 Jan 2017 06:19:02 -0500 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1cUXDi-00005x-0s for bug-gnu-emacs@gnu.org; Fri, 20 Jan 2017 06:19:02 -0500 X-Loop: help-debbugs@gnu.org Resent-From: Philipp Stephani Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Fri, 20 Jan 2017 11:19:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 25493 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: X-Debbugs-Original-To: bug-gnu-emacs@gnu.org Original-Received: via spool by submit@debbugs.gnu.org id=B.148491108732760 (code B ref -1); Fri, 20 Jan 2017 11:19:01 +0000 Original-Received: (at submit) by debbugs.gnu.org; 20 Jan 2017 11:18:07 +0000 Original-Received: from localhost ([127.0.0.1]:36058 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cUXCp-0008WK-3w for submit@debbugs.gnu.org; Fri, 20 Jan 2017 06:18:07 -0500 Original-Received: from eggs.gnu.org ([208.118.235.92]:34975) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cUXCn-0008Vq-DW for submit@debbugs.gnu.org; Fri, 20 Jan 2017 06:18:06 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cUXCg-0008NB-Ra for submit@debbugs.gnu.org; Fri, 20 Jan 2017 06:18:00 -0500 Original-Received: from lists.gnu.org ([2001:4830:134:3::11]:38564) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1cUXCg-0008N2-OB for submit@debbugs.gnu.org; Fri, 20 Jan 2017 06:17:58 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:54178) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cUXCb-0001Yw-U8 for bug-gnu-emacs@gnu.org; Fri, 20 Jan 2017 06:17:58 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cUXCa-0008KP-Id for bug-gnu-emacs@gnu.org; Fri, 20 Jan 2017 06:17:53 -0500 Original-Received: from mail-wm0-x235.google.com ([2a00:1450:400c:c09::235]:38182) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1cUXCa-0008IF-Av for bug-gnu-emacs@gnu.org; Fri, 20 Jan 2017 06:17:52 -0500 Original-Received: by mail-wm0-x235.google.com with SMTP id r144so38351167wme.1 for ; Fri, 20 Jan 2017 03:17:50 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=evIXEGIoiCsjxh4w89+ssRbGLf8SqgHz6V1WOVECFAg=; b=ji3AuR7fBPmn6q5S+h115rcSD9pCqNROE4OxpB/t+XLV64hUXMKwnEcsOOn5DpkFKT cuYAiyUay9/5/r5iPDT4LxGdnr+HcA8e3WfH8g1kBybw4VmOGnI7U1HYGFeqMj84bD2W Hcute9d/FN9RdfG9K7YID6HBtp6O4qOAdrd/w9LpFNDb06rsexX/rMi0srrHjJ4JRdPP eaQif3HBSdupv2qsrfITt8jv0iwRaokWFOuPmBddaVQyNS6AUytnFTnICq2g04aZA3so KDrFaVRXcSXvra5lWn0GzjSy008kmEZIPDgDpt1uKNdK1QFp19WsrE4IwnIXeJUe1H+A 69HA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=evIXEGIoiCsjxh4w89+ssRbGLf8SqgHz6V1WOVECFAg=; b=MIa5tg9MkVZGhApPBhmUraIIdxi8oUXEltUmYfNdLwK2lddlY4MftGOWrebXiczpX1 MSYrcPxPeTWDq5BbcrPa4uZQTCE3u64pxZI0Urh/+xjoy6D+NYT86mhiZYQtMz4ERrMK ogjSuKj3NagSTqDz1M33SIngfITAZpP6YrpGjBx06GNT0B6s+nUFtcAyfefLMRw+WVdK BdD7lt4eo33dXEuKeEWarMOf5dVfj4YJktJjYu/5M/Twn4xDqe8zOnv3nglKfw9ACdp2 2FP5Ioyp/LZNEo38VNpre1r5CjJwb4fCed+NSP4n6FjHFOybcyaC/qs06AOUA6J+rTSg s4Fw== X-Gm-Message-State: AIkVDXKUIA9juFNe3zePndqQJ3HNH5Xlzd7KT6B8n5eymgE0XhyW4Jt48Aeq4q54Y6dGhA== X-Received: by 10.223.173.181 with SMTP id w50mr11312388wrc.177.1484911068927; Fri, 20 Jan 2017 03:17:48 -0800 (PST) Original-Received: from a.muc.corp.google.com ([2a00:79e0:15:4:2854:82f2:ffa5:e57c]) by smtp.gmail.com with ESMTPSA id g197sm5406295wmd.15.2017.01.20.03.17.47 for (version=TLS1_2 cipher=AES128-SHA bits=128/128); Fri, 20 Jan 2017 03:17:47 -0800 (PST) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x 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: 208.118.235.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:128272 Archived-At: It would be very useful if ediff merge could optionally display the ancestor in a fourth window, like vimdiff or meld. See https://lists.gnu.org/archive/html/emacs-devel/2017-01/msg00204.html. In GNU Emacs 26.0.50.40 (x86_64-unknown-linux-gnu, GTK+ Version 3.10.8) of 2017-01-19 built on localhost Repository revision: 8c0fcaf66733f0538a3f024f383cb34a3c93d73c Windowing system distributor 'The X.Org Foundation', version 11.0.11501000 System Description: Ubuntu 14.04 LTS Recent messages: For information about GNU Emacs and the GNU system, type C-h C-a. Source file =E2=80=98/usr/local/google/home/phst/ThirdParty/Emacs/lisp/emac= s-lisp/derived.el=E2=80=99 newer than byte-compiled file Configured using: 'configure --with-modules --enable-checking --enable-check-lisp-object-type 'CFLAGS=3D-ggdb3 -O0'' Configured features: XPM JPEG TIFF GIF PNG SOUND GSETTINGS NOTIFY GNUTLS FREETYPE XFT ZLIB TOOLKIT_SCROLL_BARS GTK3 X11 MODULES Important settings: value of $LANG: en_US.UTF-8 locale-coding-system: utf-8-unix Major mode: Lisp Interaction Minor modes in effect: tooltip-mode: t global-eldoc-mode: t electric-indent-mode: t mouse-wheel-mode: t tool-bar-mode: t menu-bar-mode: t file-name-shadow-mode: t global-font-lock-mode: t font-lock-mode: t blink-cursor-mode: t auto-composition-mode: t auto-encryption-mode: t auto-compression-mode: t line-number-mode: t transient-mark-mode: t Load-path shadows: None found. Features: (shadow sort mail-extr emacsbug message subr-x puny seq byte-opt gv bytecomp byte-compile cl-extra help-mode cconv cl-loaddefs pcase cl-lib dired dired-loaddefs format-spec rfc822 mml easymenu mml-sec password-cache epa derived epg epg-config gnus-util rmail rmail-loaddefs mm-decode mm-bodies mm-encode mail-parse rfc2231 mailabbrev gmm-utils mailheader sendmail rfc2047 rfc2045 ietf-drums mm-util mail-prsvr mail-utils time-date mule-util tooltip eldoc electric uniquify ediff-hook vc-hooks lisp-float-type mwheel term/x-win x-win term/common-win x-dnd tool-bar dnd fontset image regexp-opt fringe tabulated-list replace newcomment text-mode elisp-mode lisp-mode prog-mode register page menu-bar rfn-eshadow isearch timer select scroll-bar mouse jit-lock font-lock syntax facemenu font-core term/tty-colors frame cl-generic cham georgian utf-8-lang misc-lang vietnamese tibetan thai tai-viet lao korean japanese eucjp-ms cp51932 hebrew greek romanian slovak czech european ethiopic indian cyrillic chinese composite charscript case-table epa-hook jka-cmpr-hook help simple abbrev obarray minibuffer cl-preloaded nadvice loaddefs button faces cus-face macroexp files text-properties overlay sha1 md5 base64 format env code-pages mule custom widget hashtable-print-readable backquote inotify dynamic-setting system-font-setting font-render-setting move-toolbar gtk x-toolkit x multi-tty make-network-process emacs) Memory information: ((conses 16 97616 6566) (symbols 48 20221 1) (miscs 40 331 156) (strings 32 17989 4269) (string-bytes 1 592161) (vectors 16 14072) (vector-slots 8 471896 4520) (floats 8 181 46) (intervals 56 206 0) (buffers 976 12) (heap 1024 31236 1025)) --=20 Google Germany GmbH Erika-Mann-Stra=C3=9Fe 33 80636 M=C3=BCnchen Registergericht und -nummer: Hamburg, HRB 86891 Sitz der Gesellschaft: Hamburg Gesch=C3=A4ftsf=C3=BChrer: Matthew Scott Sucherman, Paul Terence Manicle Diese E-Mail ist vertraulich. Wenn Sie nicht der richtige Adressat sind, leiten Sie diese bitte nicht weiter, informieren Sie den Absender und l=C3= =B6schen Sie die E-Mail und alle Anh=C3=A4nge. Vielen Dank. This e-mail is confidential. If you are not the right addressee please do = not forward it, please inform the sender, and please erase this e-mail including any attachments. Thanks.