From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Stefan Monnier Newsgroups: gmane.emacs.devel Subject: Re: tabs, git diff and git apply Date: Sat, 28 Nov 2020 09:40:47 -0500 Message-ID: References: <582708de-231a-1792-da69-844faefeaa4c@gmx.at> Mime-Version: 1.0 Content-Type: text/plain Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="36365"; mail-complaints-to="usenet@ciao.gmane.io" User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.0.50 (gnu/linux) Cc: emacs-devel To: martin rudalics Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org Sat Nov 28 15:42:16 2020 Return-path: Envelope-to: ged-emacs-devel@m.gmane-mx.org Original-Received: from lists.gnu.org ([209.51.188.17]) by ciao.gmane.io with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1kj1QW-0009MU-3w for ged-emacs-devel@m.gmane-mx.org; Sat, 28 Nov 2020 15:42:16 +0100 Original-Received: from localhost ([::1]:56328 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kj1QV-0004Jm-6f for ged-emacs-devel@m.gmane-mx.org; Sat, 28 Nov 2020 09:42:15 -0500 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:43358) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kj1PC-0003ex-7p for emacs-devel@gnu.org; Sat, 28 Nov 2020 09:40:54 -0500 Original-Received: from mailscanner.iro.umontreal.ca ([132.204.25.50]:7525) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kj1P9-0000ZW-8e for emacs-devel@gnu.org; Sat, 28 Nov 2020 09:40:53 -0500 Original-Received: from pmg3.iro.umontreal.ca (localhost [127.0.0.1]) by pmg3.iro.umontreal.ca (Proxmox) with ESMTP id 2B84F441240; Sat, 28 Nov 2020 09:40:50 -0500 (EST) Original-Received: from mail01.iro.umontreal.ca (unknown [172.31.2.1]) by pmg3.iro.umontreal.ca (Proxmox) with ESMTP id DDBB2441250; Sat, 28 Nov 2020 09:40:48 -0500 (EST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=iro.umontreal.ca; s=mail; t=1606574448; bh=wOfU53lKVj8Hw31nQ0dmBMKCfp1u7udZZCdwqTkJoh8=; h=From:To:Cc:Subject:References:Date:In-Reply-To:From; b=VR7xGFKhfxeEJxC5MvIgLAanmF2/Yz5c6IQ6tKAJ9B0qvJoh/ixNA62eB95XI03dq OasNr+Dk3GTT5p1GQDhAvsDduYZAYc41dwlZxtVut7Nen9RMFwzGbtlTy+PsvGgmTK d61OvCrZkw3dx/Lx+bCLfp9qbIQ0PGckVssuLL/Yr6ELbAHL/XWf6St2db3HyKMJdO l+A3MjIug6cXywm8liWLEfqDRnNqlVPITsoPEu7PObC3MeCfwT5XSzu2WH4O4bGlPd fdfD+FqLXXjn/9ccyDtB4wVEFsZK87TIvXAs8rmejIzwcU4t5a0F4YqS+NY29HMXzc gnUfcBY5rjTqw== Original-Received: from alfajor (69-165-136-52.dsl.teksavvy.com [69.165.136.52]) by mail01.iro.umontreal.ca (Postfix) with ESMTPSA id A5CE5120387; Sat, 28 Nov 2020 09:40:48 -0500 (EST) In-Reply-To: <582708de-231a-1792-da69-844faefeaa4c@gmx.at> (martin rudalics's message of "Sat, 28 Nov 2020 10:29:51 +0100") Received-SPF: pass client-ip=132.204.25.50; envelope-from=monnier@iro.umontreal.ca; helo=mailscanner.iro.umontreal.ca X-Spam_score_int: -42 X-Spam_score: -4.3 X-Spam_bar: ---- X-Spam_report: (-4.3 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, RCVD_IN_DNSWL_MED=-2.3, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.23 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-mx.org@gnu.org Original-Sender: "Emacs-devel" Xref: news.gmane.io gmane.emacs.devel:259954 Archived-At: > Some three lines appearing in my window.c as > > if (WINDOWP (w->contents)) > cont = foreach_window_1 (XWINDOW (w->contents), fn, user_data); > else > > appear in *shell* after git diff as > > + if (WINDOWP (w->contents)) > + cont = foreach_window_1 (XWINDOW (w->contents), fn, user_data); > + else > > Note the extra space after the "+" in the second line and the off-by-one > indentation. Any chance you're using non-unified diffs? These match the "[-+ ] " pattern, contrary to unified diffs which use "[-+ ]". IOW, maybe there's nothing wrong. > A subsequent git apply then complains about > > /home/martin/temp/master..changes-2020-11-28.diff:3847: space before tab in indent. > cont = foreach_window_1 (XWINDOW (w->contents), fn, user_data); Hard to tell without more info. Have you tried it in an xterm rather than withing a *shell* buffer? Stefan