From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!.POSTED!not-for-mail From: Kaushal Modi Newsgroups: gmane.emacs.devel Subject: Difficulty applying multi-file patches from within emacs (Was: Proposal: new mode-line `%'-construct %o ..) Date: Sun, 21 May 2017 15:55:45 +0000 Message-ID: References: <20170515204416.GA7349@acm.fritz.box> <20170520103428.GB4616@acm.fritz.box> NNTP-Posting-Host: blaine.gmane.org Mime-Version: 1.0 Content-Type: multipart/alternative; boundary="001a114b25ec3bd2b705500acaca" X-Trace: blaine.gmane.org 1495382202 1806 195.159.176.226 (21 May 2017 15:56:42 GMT) X-Complaints-To: usenet@blaine.gmane.org NNTP-Posting-Date: Sun, 21 May 2017 15:56:42 +0000 (UTC) To: Alan Mackenzie , emacs-devel@gnu.org, Michael Heerdegen Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sun May 21 17:56:37 2017 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 1dCTDh-0000JP-Jv for ged-emacs-devel@m.gmane.org; Sun, 21 May 2017 17:56:37 +0200 Original-Received: from localhost ([::1]:38478 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dCTDj-00064k-W9 for ged-emacs-devel@m.gmane.org; Sun, 21 May 2017 11:56:40 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:58117) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dCTD6-00064T-Os for emacs-devel@gnu.org; Sun, 21 May 2017 11:56:01 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dCTD5-00016N-9n for emacs-devel@gnu.org; Sun, 21 May 2017 11:56:00 -0400 Original-Received: from mail-lf0-x242.google.com ([2a00:1450:4010:c07::242]:35111) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1dCTD4-00015t-Pj for emacs-devel@gnu.org; Sun, 21 May 2017 11:55:59 -0400 Original-Received: by mail-lf0-x242.google.com with SMTP id 99so3396832lfu.2 for ; Sun, 21 May 2017 08:55:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:references:in-reply-to:from:date:message-id:subject:to; bh=A8jC2WL7RTiwAJ/Td+s+RXimCPfrD7CBJx/09ZOVUr8=; b=QJdCs2oTIuj+IjPae2iVFMgeNdOIsF07uOZqjJTdJ9SGxQDHIhVlMI6RjHJuuJuKuG 24X0rrCdVm+sPmgyzs3hOhoPcHHuP+CKTTj3lUaIW0g9Lr9HmWW/NL1910reYmUXeJR6 E/HeCtpPyR02QnJfQ/Cv2/pzcfvlIVwtcuzQLlnm4Jg1fuNwjBAxcLhnxJIUBfNhWitZ 0hmgyJtWt6T2UlQEsyfhcq8V/1FxFUV3tK5WIOPEkCFEN7eQBZtaUIqAnWp8bAhZZJDj KUbCNYpB56M8ixgAe+wlwyDrThAtrye+jAGp3LoN/+8VUIX9jlmqcFOjNyo0aia7A5Dd vhcg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to; bh=A8jC2WL7RTiwAJ/Td+s+RXimCPfrD7CBJx/09ZOVUr8=; b=bxop2s/OrKtNUSDyaPF5WJJ4/FsmnLC+NDI0qNdaLn4fsV72wuV4zzXQvzf/B5nx4d 90lDP8cYbpFtWWjz8IFMoe4hM3o87C2z9VsR+I9jfoBUtDtvny7FSkljxGPT5Xqros+b DJhESKmXAMnM3H+n786O5CZBfr6Se2e9PZFaEhdeesCD6udPw7GDS+K2U5THcfUGfSx/ pZ4arTj8p+j+Aj6xkgIlQJPAXwYQavnHSND+xHsmum+Xl1gq6Nuq0X4qdtm/AN96DI0L uMW8eXM6L+K/XB8yzK3IlTSnv8tZ3Mc/rW779mXHH3xWq/ByqfuUtQlNZ+xLNZTRBm5M zCdQ== X-Gm-Message-State: AODbwcAFhnjApOGwWIUOS8sOeuRnf/nZmn7d+AH0kjYXGjhlNC0dFjYt q0MgGnblM8qPKa1d8GEbOhC1sqG2Ow== X-Received: by 10.25.196.196 with SMTP id u187mr5599431lff.88.1495382156364; Sun, 21 May 2017 08:55:56 -0700 (PDT) In-Reply-To: <20170520103428.GB4616@acm.fritz.box> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4010:c07::242 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:215051 Archived-At: --001a114b25ec3bd2b705500acaca Content-Type: text/plain; charset="UTF-8" On Sat, May 20, 2017 at 6:35 AM Alan Mackenzie wrote: > On Mon, May 15, 2017 at 20:44:17 +0000, Alan Mackenzie wrote: > > Hello, Emacs. > > > I've always been annoyed by the percentage output by the mode-line > > construct "%p" - so much so that I patched my personal copy of > > `decode-mode-spec' in xdisp.c over ten years ago (thanks for the tip > > then, Eli!). > > [ .... ] > > Here is a patch which implements %o and %q. Feedback would be welcome, > of course. > Hello, I wanted to try out this patch, but I faced issues applying multi-file patch from within emacs. If this were a git-formatted patch, I would have tried "git am". But as this is a plain diff patch, that wouldn't work and I attempted M-x ediff-patch-file. But then I ended with with an issue which is well-described by Michael (copied on this email) in a thread on help-gnu-emacs back in Feb this year: http://lists.gnu.org/archive/html/help-gnu-emacs/2017-02/msg00035.html It's the same issue that when I specify the root dir for all the patches to be applied, ediff-patch-file in my case (epatch in the case in that Feb 2017 thread) does not parse the subdirs for the unified diff format headers. In that thread, Eli suggests using patch utility directly from the command-line. But I really wished ediff-patch-file/epatch worked correctly when applying multi-file patches. So the reason for this thread is: - Has anyone been able to apply multi-file patches from within emacs? If so, how? - If someone has worked out the issues with ediff-patch-file/epatch for this issue and the solution is lying around in their workarea, it would be awesome if they provided a patch to fix it upstream :) - I followed that Feb 2017 help thread, and it wasn't clear if a solution was reached.. was it? -- Kaushal Modi --001a114b25ec3bd2b705500acaca Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable
On Sat, May 20= , 2017 at 6:35 AM Alan Mackenzie <acm@muc.= de> wrote:
On Mon, May 15, 2= 017 at 20:44:17 +0000, Alan Mackenzie wrote:
> Hello, Emacs.

> I've always been annoyed by the percentage output by the mode-line=
> construct "%p" - so much so that I patched my personal copy = of
> `decode-mode-spec' in xdisp.c over ten years ago (thanks for the t= ip
> then, Eli!).

[ .... ]

Here is a patch which implements %o and %q.=C2=A0 Feedback would be welcome= ,
of course.

Hello,

<= div>I wanted to try out this patch, but I faced issues applying multi-file = patch from within emacs. If this were a git-formatted patch, I would have t= ried "git am". But as this is a plain diff patch, that wouldn'= ;t work and I attempted M-x ediff-patch-file.

But = then I ended with with an issue which is well-described by Michael (copied = on this email) in a thread on help-gnu-emacs back in Feb this year:=C2=A0http://lists.gnu.org/archive/html/help-gnu-emacs/2017-02/msg00035.htm= l

It's the same issue that when I specify = the root dir for all the patches to be applied, ediff-patch-file in my case= (epatch in the case in that Feb 2017 thread) does not parse the subdirs fo= r the unified diff format headers.

In that thread,= Eli suggests using patch utility directly from the command-line. But I rea= lly wished ediff-patch-file/epatch worked correctly when applying multi-fil= e patches.

So the reason for this thread is:
=

- Has anyone been able to apply multi-file patches from= within emacs? If so, how?
- If someone has worked out the issues= with ediff-patch-file/epatch for this issue and the solution is lying arou= nd in their workarea, it would be awesome if they provided a patch to fix i= t upstream :)
- I followed that Feb 2017 help thread, and it wasn= 't clear if a solution was reached.. was it?
--

Kaushal Modi

--001a114b25ec3bd2b705500acaca--