Re: master b299c04201: Fix computation of outline heading level for non-git diff

Re: master b299c04201: Fix computation of outline heading level for non-git diff

[Stefan Monnier]

>     Fix computation of outline heading level for non-git diff
>     
>     * lisp/vc/diff-mode.el (diff-setup-buffer-type): Compute outline
>     heading level using diff-hunk-header-re (bug#51809).

Sounds good, thanks.

>     (diff--font-lock-prettify): Disable prettify in non-git diff.

Hmmm... why?


        Stefan

Re: master b299c04201: Fix computation of outline heading level for non-git diff

[Matthias Meulien]

[-- Attachment #1: Type: text/plain, Size: 241 bytes --]

Stefan Monnier <monnier@iro.umontreal.ca> writes:

>>     (diff--font-lock-prettify): Disable prettify in non-git diff.
>
> Hmmm... why?

Because my experience is that `diff--font-lock-prettify' is broken with
diff not coming from Git. Eg,


[-- Attachment #2: with_prettify.png --]
[-- Type: image/png, Size: 66323 bytes --]

[-- Attachment #3: Type: text/plain, Size: 25 bytes --]


for the attached diff.


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #4: woman.patch --]
[-- Type: text/x-diff, Size: 560 bytes --]

--- woman.el.orig
+++ woman.el
@@ -2299,9 +2299,9 @@
       (replace-match woman-unpadded-space-string t t))
 
     ;; Discard optional hyphen \%; concealed newlines \<newline>;
-    ;; point-size change function \sN,\s+N, \s-N:
+    ;; kerning \/, \,; point-size change function \sN,\s+N, \s-N:
     (goto-char from)
-    (while (re-search-forward "\\\\\\([%\n]\\|s[-+]?[0-9]+\\)" nil t)
+    (while (re-search-forward "\\\\\\([%\n/,]\\|s[-+]?[0-9]+\\)" nil t)
       (woman-delete-match 0))
 
     ;; BEWARE: THIS SHOULD PROBABLY ALL BE DONE MUCH LATER!!!!!

[-- Attachment #5: Type: text/plain, Size: 67 bytes --]


I must admit I've not tried to fix it for that diff.
-- 
Matthias

Re: master b299c04201: Fix computation of outline heading level for non-git diff

[Stefan Monnier]

Matthias Meulien [2022-02-17 08:21:21] wrote:
> Stefan Monnier <monnier@iro.umontreal.ca> writes:
>>>     (diff--font-lock-prettify): Disable prettify in non-git diff.
>> Hmmm... why?
> Because my experience is that `diff--font-lock-prettify' is broken with
> diff not coming from Git. Eg,

Ah, thanks.  I just pushed a patch which should fix it.


        Stefan

Re: master b299c04201: Fix computation of outline heading level for non-git diff

[Matthias Meulien]

Stefan Monnier <monnier@iro.umontreal.ca> writes:

> Ah, thanks.  I just pushed a patch which should fix it.

Can you confirm that for the patch file I submitted, after your fix is
applied, `diff--font-lock-prettify' is now supposed to do nothing?

This is what I observe. (Which is better than the previous broken
state, thank you!)

(Just in case 😉 there're other cases where prettifying diff's doesn't
work as expected: They're described in bug#54034.)
-- 
Matthias

Re: master b299c04201: Fix computation of outline heading level for non-git diff

[Stefan Monnier]

Matthias Meulien [2022-02-20 09:02:33] wrote:
> Stefan Monnier <monnier@iro.umontreal.ca> writes:
>> Ah, thanks.  I just pushed a patch which should fix it.
> Can you confirm that for the patch file I submitted, after your fix is
> applied, `diff--font-lock-prettify' is now supposed to do nothing?

Not quite.  My patch fixes the error that incorrectly moved the first
`+` and `-` of the file header to the fringe.  IOW the result is that on
non-Git diffs, `diff--font-lock-prettify` will still move the `+` and
`-` of the diffs into the fringe, but it will leave the rest (most
importantly the file headers) untouched.

> (Just in case 😉 there're other cases where prettifying diff's doesn't
> work as expected: They're described in bug#54034.)

I'll see you there ;-)


        Stefan