From: martin rudalics <rudalics@gmx.at>
To: Andreas Schwab <schwab@linux-m68k.org>
Cc: emacs-devel <emacs-devel@gnu.org>
Subject: Re: tabs, git diff and git apply
Date: Sat, 28 Nov 2020 13:45:59 +0100 [thread overview]
Message-ID: <7421de3b-7a86-a3db-8228-95ac773d922c@gmx.at> (raw)
In-Reply-To: <87tut9lm3q.fsf@igel.home>
> 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
next prev parent reply other threads:[~2020-11-28 12:45 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-11-28 9:29 tabs, git diff and git apply martin rudalics
2020-11-28 9:39 ` Andreas Schwab
2020-11-28 10:15 ` martin rudalics
2020-11-28 10:23 ` Andreas Schwab
2020-11-28 10:28 ` martin rudalics
2020-11-28 12:08 ` Andreas Schwab
2020-11-28 12:45 ` martin rudalics [this message]
2020-11-28 13:34 ` Andreas Schwab
2020-11-28 14:20 ` martin rudalics
2020-11-28 17:27 ` Alfred M. Szmidt
2020-11-28 18:23 ` martin rudalics
2020-11-28 18:52 ` Alfred M. Szmidt
2020-11-29 8:21 ` martin rudalics
2020-11-29 9:13 ` Alfred M. Szmidt
2020-11-29 9:52 ` martin rudalics
2020-11-29 9:56 ` Yuri Khan
2020-11-28 14:40 ` Stefan Monnier
2020-11-28 15:45 ` martin rudalics
2020-11-28 16:47 ` Stefan Monnier
2020-11-28 18:22 ` martin rudalics
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://www.gnu.org/software/emacs/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=7421de3b-7a86-a3db-8228-95ac773d922c@gmx.at \
--to=rudalics@gmx.at \
--cc=emacs-devel@gnu.org \
--cc=schwab@linux-m68k.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/emacs.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).