From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: =?ISO-8859-1?Q?R=FCdiger?= Sonderfeld Newsgroups: gmane.emacs.devel Subject: Re: ESR's intimidatingly huge task list Date: Sat, 11 Jan 2014 19:07:15 +0100 Message-ID: <1836151.BLPShGdEM7@descartes> References: <20140111165635.D683C3803A6@snark.thyrsus.com> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Trace: ger.gmane.org 1389463658 24703 80.91.229.3 (11 Jan 2014 18:07:38 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sat, 11 Jan 2014 18:07:38 +0000 (UTC) Cc: "Eric S. Raymond" To: emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sat Jan 11 19:07:46 2014 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 1W22yG-0000sy-65 for ged-emacs-devel@m.gmane.org; Sat, 11 Jan 2014 19:07:44 +0100 Original-Received: from localhost ([::1]:35026 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1W22yF-000385-MR for ged-emacs-devel@m.gmane.org; Sat, 11 Jan 2014 13:07:43 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:54299) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1W22y7-00037x-Ut for emacs-devel@gnu.org; Sat, 11 Jan 2014 13:07:41 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1W22y1-0006l2-T5 for emacs-devel@gnu.org; Sat, 11 Jan 2014 13:07:35 -0500 Original-Received: from ptmx.org ([178.63.28.110]:60493) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1W22y1-0006k5-Mr for emacs-devel@gnu.org; Sat, 11 Jan 2014 13:07:29 -0500 Original-Received: from localhost (localhost [127.0.0.1]) by ptmx.org (Postfix) with ESMTP id 3631522564; Sat, 11 Jan 2014 19:07:28 +0100 (CET) X-Virus-Scanned: Debian amavisd-new at ptmx.org Original-Received: from ptmx.org ([127.0.0.1]) by localhost (ptmx.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id xXFHcSXzayNA; Sat, 11 Jan 2014 19:07:26 +0100 (CET) Original-Received: from descartes.localnet (chello080108246092.7.14.vie.surfer.at [80.108.246.92]) by ptmx.org (Postfix) with ESMTPSA id 0B2E821678; Sat, 11 Jan 2014 19:07:25 +0100 (CET) User-Agent: KMail/4.11.3 (Linux/3.11.0-14-generic; KDE/4.11.3; x86_64; ; ) In-Reply-To: <20140111165635.D683C3803A6@snark.thyrsus.com> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-Received-From: 178.63.28.110 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:168101 Archived-At: On Saturday 11 January 2014 11:56:35 Eric S. Raymond wrote: > * Better cross-VCS integration of smerge in vc.el. Here are Stefan's= > requirements: >=20 > - Improve vc-git.el so that it can automatically enable smerge-mode = when > opening a conflicted file and (probably conditional on a config va= r) > mark the file as "not conflicted any more" when saving with no > remaining diff3 markers. > This currently works in vc-bzr.el (and vc-svn.el as well, IIRC). >=20 > - Improve vc-git.el with vc-git-conflicted-files so that > vc-find-conflicted-files works for Git as well. See my patch proposal: https://lists.gnu.org/archive/html/emacs-devel/2014-01/msg01038.html Regards, R=C3=BCdiger