* bug#12585: diff refine should highlight space changes better (feature request)
@ 2012-10-06 15:25 Le Wang
2012-10-06 16:07 ` Stefan Monnier
2012-10-06 19:00 ` Juri Linkov
0 siblings, 2 replies; 8+ messages in thread
From: Le Wang @ 2012-10-06 15:25 UTC (permalink / raw)
To: 12585
When I diff from magit, it highlights spaces at EOL. see: http://puu.sh/1bY8l
The default diff refinining does not do that. In fact, we should be
able to do better than magit and highlight inline space changes as
well.
--
Le
^ permalink raw reply [flat|nested] 8+ messages in thread
* bug#12585: diff refine should highlight space changes better (feature request)
2012-10-06 15:25 bug#12585: diff refine should highlight space changes better (feature request) Le Wang
@ 2012-10-06 16:07 ` Stefan Monnier
2012-10-06 19:00 ` Juri Linkov
1 sibling, 0 replies; 8+ messages in thread
From: Stefan Monnier @ 2012-10-06 16:07 UTC (permalink / raw)
To: Le Wang; +Cc: 12585
> When I diff from magit, it highlights spaces at EOL. see: http://puu.sh/1bY8l
> The default diff refinining does not do that. In fact, we should be
> able to do better than magit and highlight inline space changes as
> well.
AFAIK Emacs-24's diff-mode does that as well, regardless of diff-refine-hunk.
Stefan
^ permalink raw reply [flat|nested] 8+ messages in thread* bug#12585: diff refine should highlight space changes better (feature request)
2012-10-06 15:25 bug#12585: diff refine should highlight space changes better (feature request) Le Wang
2012-10-06 16:07 ` Stefan Monnier
@ 2012-10-06 19:00 ` Juri Linkov
2012-10-07 2:36 ` Le Wang
1 sibling, 1 reply; 8+ messages in thread
From: Juri Linkov @ 2012-10-06 19:00 UTC (permalink / raw)
To: Le Wang; +Cc: 12585
> In fact, we should be able to do better than magit
> and highlight inline space changes as well.
Inline space changes can be highlighted after setting
`smerge-refine-ignore-whitespace' to nil
(maybe it should be defcustom instead of defvar?)
^ permalink raw reply [flat|nested] 8+ messages in thread
* bug#12585: diff refine should highlight space changes better (feature request)
2012-10-06 19:00 ` Juri Linkov
@ 2012-10-07 2:36 ` Le Wang
2012-10-07 9:37 ` Juri Linkov
0 siblings, 1 reply; 8+ messages in thread
From: Le Wang @ 2012-10-07 2:36 UTC (permalink / raw)
To: Juri Linkov; +Cc: 12585
On Sun, Oct 7, 2012 at 3:00 AM, Juri Linkov <juri@jurta.org> wrote:
>> In fact, we should be able to do better than magit
>> and highlight inline space changes as well.
>
> Inline space changes can be highlighted after setting
> `smerge-refine-ignore-whitespace' to nil
> (maybe it should be defcustom instead of defvar?)
How would I use smerge in this context? I'm just pressing C-c C-b to
refine a diff hunk right now.
--
Le
^ permalink raw reply [flat|nested] 8+ messages in thread
* bug#12585: diff refine should highlight space changes better (feature request)
2012-10-07 2:36 ` Le Wang
@ 2012-10-07 9:37 ` Juri Linkov
2012-10-07 14:09 ` Stefan Monnier
2012-10-08 14:26 ` Le Wang
0 siblings, 2 replies; 8+ messages in thread
From: Juri Linkov @ 2012-10-07 9:37 UTC (permalink / raw)
To: Le Wang; +Cc: 12585
>> Inline space changes can be highlighted after setting
>> `smerge-refine-ignore-whitespace' to nil
>> (maybe it should be defcustom instead of defvar?)
>
> How would I use smerge in this context? I'm just pressing C-c C-b to
> refine a diff hunk right now.
`C-c C-b' in diff uses `smerge-refine-ignore-whitespace' from smerge.
Perhaps diff should have a duplicate option `diff-refine-ignore-whitespace'
with the same functionality but a different name prefix.
^ permalink raw reply [flat|nested] 8+ messages in thread
* bug#12585: diff refine should highlight space changes better (feature request)
2012-10-07 9:37 ` Juri Linkov
@ 2012-10-07 14:09 ` Stefan Monnier
2012-10-08 14:26 ` Le Wang
1 sibling, 0 replies; 8+ messages in thread
From: Stefan Monnier @ 2012-10-07 14:09 UTC (permalink / raw)
To: Juri Linkov; +Cc: 12585, Le Wang
>>> Inline space changes can be highlighted after setting
>>> `smerge-refine-ignore-whitespace' to nil
>>> (maybe it should be defcustom instead of defvar?)
>> How would I use smerge in this context? I'm just pressing C-c C-b to
>> refine a diff hunk right now.
> `C-c C-b' in diff uses `smerge-refine-ignore-whitespace' from smerge.
> Perhaps diff should have a duplicate option `diff-refine-ignore-whitespace'
> with the same functionality but a different name prefix.
Or rather, the refinement code should be taken out of smerge into its
own package.
Stefan
^ permalink raw reply [flat|nested] 8+ messages in thread* bug#12585: diff refine should highlight space changes better (feature request)
2012-10-07 9:37 ` Juri Linkov
2012-10-07 14:09 ` Stefan Monnier
@ 2012-10-08 14:26 ` Le Wang
2022-01-26 17:55 ` Lars Ingebrigtsen
1 sibling, 1 reply; 8+ messages in thread
From: Le Wang @ 2012-10-08 14:26 UTC (permalink / raw)
To: Juri Linkov; +Cc: 12585
On Sun, Oct 7, 2012 at 5:37 PM, Juri Linkov <juri@jurta.org> wrote:
> `C-c C-b' in diff uses `smerge-refine-ignore-whitespace' from smerge.
> Perhaps diff should have a duplicate option `diff-refine-ignore-whitespace'
> with the same functionality but a different name prefix.
I see. I didn't have a background set in my theme. Thanks for the pointer.
The setting should be a defcustom in diff group so it's easier to discover.
--
Le
^ permalink raw reply [flat|nested] 8+ messages in thread
* bug#12585: diff refine should highlight space changes better (feature request)
2012-10-08 14:26 ` Le Wang
@ 2022-01-26 17:55 ` Lars Ingebrigtsen
0 siblings, 0 replies; 8+ messages in thread
From: Lars Ingebrigtsen @ 2022-01-26 17:55 UTC (permalink / raw)
To: Le Wang; +Cc: 12585
Le Wang <l26wang@gmail.com> writes:
> I see. I didn't have a background set in my theme. Thanks for the pointer.
>
> The setting should be a defcustom in diff group so it's easier to discover.
(I'm going through old bug reports that unfortunately weren't resolved
at the time.)
I've now done this in Emacs 29.
--
(domestic pets only, the antidote for overdose, milk.)
bloggy blog: http://lars.ingebrigtsen.no
^ permalink raw reply [flat|nested] 8+ messages in thread
end of thread, other threads:[~2022-01-26 17:55 UTC | newest]
Thread overview: 8+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2012-10-06 15:25 bug#12585: diff refine should highlight space changes better (feature request) Le Wang
2012-10-06 16:07 ` Stefan Monnier
2012-10-06 19:00 ` Juri Linkov
2012-10-07 2:36 ` Le Wang
2012-10-07 9:37 ` Juri Linkov
2012-10-07 14:09 ` Stefan Monnier
2012-10-08 14:26 ` Le Wang
2022-01-26 17:55 ` Lars Ingebrigtsen
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).