From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: martin rudalics Newsgroups: gmane.emacs.devel Subject: Re: tabs, git diff and git apply Date: Sat, 28 Nov 2020 13:45:59 +0100 Message-ID: <7421de3b-7a86-a3db-8228-95ac773d922c@gmx.at> References: <582708de-231a-1792-da69-844faefeaa4c@gmx.at> <87zh31252h.fsf@linux-m68k.org> <4cff3ce3-9695-cd71-0a78-9e95e3a9a252@gmx.at> <87v9dp230t.fsf@linux-m68k.org> <7f952834-eed5-0884-80f9-4702663ed37b@gmx.at> <87tut9lm3q.fsf@igel.home> Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 7bit Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="8684"; mail-complaints-to="usenet@ciao.gmane.io" Cc: emacs-devel To: Andreas Schwab Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org Sat Nov 28 13:49:36 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 1kizfT-00027m-4a for ged-emacs-devel@m.gmane-mx.org; Sat, 28 Nov 2020 13:49:35 +0100 Original-Received: from localhost ([::1]:33352 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kizfR-0004ll-TS for ged-emacs-devel@m.gmane-mx.org; Sat, 28 Nov 2020 07:49:34 -0500 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:54398) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kizc8-0004Cg-Bq for emacs-devel@gnu.org; Sat, 28 Nov 2020 07:46:08 -0500 Original-Received: from mout.gmx.net ([212.227.17.22]:59093) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kizc5-0004pb-2W for emacs-devel@gnu.org; Sat, 28 Nov 2020 07:46:08 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=badeba3b8450; t=1606567560; bh=Jsc7dsrucHKI1mHura0IR6/iougChqGIAEkQOloGurA=; h=X-UI-Sender-Class:Subject:To:Cc:References:From:Date:In-Reply-To; b=P+F0cY60BYWDwlZF7MUWPz3D4GdWo5nxymyizkSGQtlZl7MeJ3as2s9VARQ10/kg1 GC4AOQkbHlNQCKkJ5S+jX8K+izfAbHuoFr//GNYNJBmUCm5kJoJWdfHV1zmuMasZRS 59h21Ceu0TnCrEfgjPYJIQpZ7bMWQ3M+05WDjiOI= X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c Original-Received: from [192.168.1.100] ([212.95.5.5]) by mail.gmx.com (mrgmx105 [212.227.17.168]) with ESMTPSA (Nemesis) id 1MSKy8-1kcMrY1pAu-00SjRT; Sat, 28 Nov 2020 13:46:00 +0100 In-Reply-To: <87tut9lm3q.fsf@igel.home> Content-Language: en-US X-Provags-ID: V03:K1:CMjL6/LHN+ZhFzuosCpkvb3r2gro6OAnVgstNrZyH9S4i5IWqsW IdeE6nPwkgijQvPBpC4L0MIhwiEvSnLd0Tzof8+rF3puTsg+TUhZ4Rlr8MiEnjFBTviPs6Q 2OTNP/uVGAf/Sd1SIQtUPX7bLSPh0HWZzJuKZjBEcxpZcsvTQIptAxdZe1PvuQMqKiRlC24 pXuLMxPeoZjcHXK9DoKKg== X-UI-Out-Filterresults: notjunk:1;V03:K0:ePEHl60PW8U=:qaDViIAlgM72MzZDe7Moiz KHGLTvkW4cojFZ664VpLy24bHnEFkfpJxVAvP5lRT836Ubrebit1eCBL7zRpo7CTjidgRLREV PPHOmMJfF9Uc+gQE1+23ZsKnfLRlmh0NDrdPEEvJvljeBV3YVPO1OP8CLrug23H/k0TlyAfRF taniH19KQjtZKOTtDKBFgYuNeaoW4GBrJLEuvMADoOW0GaNgPx1PFhEUb3udRwVWldOnyOcbQ b0cC+CDoBlEOIP/DEZ0l7TCPe/h0Tc/v6Y/jC6qjZnTD4ByIIogww29AxpzEos0q6SghQkq7s 6rceL20WltEKQu1LY35Ydi3ttSqiXuTD0runykv8gXOpSY9gjxI/l2wWBCdny583URbU5T0/M dLEtejtqkiQfIjm3AyTbxo0Sh7XC1mcweiulCcyrj1RXpjELuzQbjNbVsEpzNLJvOpH+d8Yi5 DSWrkIBl6hgDeMG4Sj1fDGKXbKUwAZXNCMx6I84uknoUPbVqueKGJ0GBnH+llfWIl/zOAMjWc t150W7u+YE5TWp1nZ4Uxj6wDkEhdKxaN9xUR37dG0wTF/zxmCTTnVafedQZkmTqz51sH+Stku D6ov+X/z92ZcDKWmKQlVLfsIJjrdY1iW1ZfNm934vuKUwt3miZfl1y3wKTO6n7vVo6jZMbtYj EpihHrh2ruYSSZxGa1XDP9ZszYXmS70+Z8Ke15f5G7KyWwwGMY33DeE2KTY4YfOIud4KZueKr UMgfyDqBbxd1jVHJE1HQ0++6hI9aDbIU6gwSII+ngUDAJTzJHYdIDfsHh1MEy+LUbUF5RPv/ Received-SPF: pass client-ip=212.227.17.22; envelope-from=rudalics@gmx.at; helo=mout.gmx.net X-Spam_score_int: -25 X-Spam_score: -2.6 X-Spam_bar: -- X-Spam_report: (-2.6 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H2=-0.001, 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:259951 Archived-At: > So you are applying a patch with whitespace errors. What is the issue? That that "whitespace error" was introduced by git diff. The character at the beginning of that line in window.c cont = foreach_window_1 (XWINDOW (w->contents), fn, user_data); is described by Emacs as position: 8315 of 341150 (2%), column: 0 character: TAB (displayed as TAB) (codepoint 9, #o11, #x9) charset: ascii (ASCII (ISO646 IRV)) code point in charset: 0x09 script: latin syntax: which means: whitespace to input: type "C-x 8 RET 9" or "C-x 8 RET CHARACTER TABULATION" buffer code: #x09 file code: #x09 (encoded by coding system undecided-unix) display: no font available Character code properties: customize what to show old-name: CHARACTER TABULATION general-category: Cc (Other, Control) There are text properties here: fontified t Now where does the space produced by git diff come from so that in + cont = foreach_window_1 (XWINDOW (w->contents), fn, user_data); the character following the "+" is described by Emacs as position: 163661 of 384033 (43%), column: 1 character: SPC (displayed as SPC) (codepoint 32, #o40, #x20) charset: ascii (ASCII (ISO646 IRV)) code point in charset: 0x20 script: latin syntax: which means: whitespace category: .:Base, a:ASCII, l:Latin to input: type "C-x 8 RET 20" or "C-x 8 RET SPACE" buffer code: #x20 file code: #x20 (encoded by coding system utf-8-unix) display: by this font (glyph code) ftcrhb:-PfEd-DejaVu Sans Mono-normal-normal-normal-*-13-*-*-*-m-0-iso10646-1 (#x03) hardcoded face: nobreak-space Character code properties: customize what to show name: SPACE general-category: Zs (Separator, Space) decomposition: (32) (' ') There are 2 overlays here: From 163088 to 164494 diff--font-lock-syntax t diff-mode syntax evaporate t modification-hooks (diff--overlay-auto-delete) From 163088 to 164494 diff--font-lock-refined t diff-mode fine evaporate t modification-hooks (diff--overlay-auto-delete) There are text properties here: face diff-added fontified t martin