emacs-devel
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: tabs, git diff and git apply


From: martin rudalics
Subject: Re: tabs, git diff and git apply
Date: Sat, 28 Nov 2020 13:45:59 +0100

> 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



reply via email to

[Prev in Thread] Current Thread [Next in Thread]