From: Eli Zaretskii <eliz@gnu.org>
To: Juri Linkov <juri@linkov.net>
Cc: 33567@debbugs.gnu.org
Subject: bug#33567: Syntactic fontification of diff hunks
Date: Fri, 14 Dec 2018 11:13:48 +0200 [thread overview]
Message-ID: <834lbgh3n7.fsf@gnu.org> (raw)
In-Reply-To: <87mupafi73.fsf@mail.linkov.net> (message from Juri Linkov on Thu, 13 Dec 2018 01:17:52 +0200)
> From: Juri Linkov <juri@linkov.net>
> Cc: 33567@debbugs.gnu.org
> Date: Thu, 13 Dec 2018 01:17:52 +0200
>
> Here is a more less final version that I tested on many different diffs:
Thanks, I have a few minor comments, mainly to the documentation
parts.
> diff --git a/etc/NEWS b/etc/NEWS
> index decc5e3954..1024e9e9f5 100644
> --- a/etc/NEWS
> +++ b/etc/NEWS
> @@ -273,6 +273,8 @@ To disable it, set the new defcustom 'diff-font-lock-refine' to nil.
> *** File headers can be shortened, mimicking Magit's diff format
> To enable it, set the new defcustom 'diff-font-lock-prettify to t.
>
> +*** Source language syntax is highlighted in diff hunks when 'diff-font-lock-syntax' is t.
This line is too long, suggest to rephrase:
*** Better syntax highlighting of Diff hunks.
Fragments of source in Diff hunks are now by default highlighted
according to the appropriate major mode. Customize the new option
'diff-font-lock-syntax' to nil to disable this.
> +@vindex diff-font-lock-syntax
> + If non-nil, diff hunk font-lock includes source language syntax highlighting.
"nil" should be in @code.
> diff --git a/lisp/vc/diff.el b/lisp/vc/diff.el
> index ac94586cac..93fa54b1fb 100644
> --- a/lisp/vc/diff.el
> +++ b/lisp/vc/diff.el
> @@ -165,6 +167,7 @@ diff-no-select
> (lambda (_ignore-auto _noconfirm)
> (diff-no-select old new switches no-async (current-buffer))))
> (setq default-directory thisdir)
> + (set (make-local-variable 'diff-default-directory) default-directory)
Any reason not to use setq-local?
> +(defun diff--font-lock-syntax (max)
> + "Syntax highlighting from font-lock."
Although an internal function, could it have a slightly more detailed
do string, please?
> +(defun diff-syntax-fontify-hunk (beg end old)
> + "Highlight source language syntax in diff hunks."
This is for a single hunk, not "hunks", right? Also, please mention
the arguments in the doc string.
> +(defun diff-syntax-fontify-props (file text line-nb &optional no-init hunk-only)
> + "Get font-lock properties from the source code."
Please mention the arguments ion the doc string.
next prev parent reply other threads:[~2018-12-14 9:13 UTC|newest]
Thread overview: 61+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-12-01 21:55 bug#33567: Syntactic fontification of diff hunks Juri Linkov
2018-12-02 6:56 ` Eli Zaretskii
2018-12-03 0:34 ` Juri Linkov
2018-12-03 6:49 ` Eli Zaretskii
2018-12-03 23:36 ` Juri Linkov
2018-12-04 7:01 ` Eli Zaretskii
2018-12-04 23:16 ` Juri Linkov
2018-12-05 7:19 ` Eli Zaretskii
2018-12-05 23:25 ` Juri Linkov
2018-12-06 6:53 ` Eli Zaretskii
2018-12-11 0:38 ` Juri Linkov
2018-12-11 6:23 ` Eli Zaretskii
2018-12-12 0:28 ` Juri Linkov
2018-12-12 17:11 ` Eli Zaretskii
2018-12-03 23:59 ` Juri Linkov
2018-12-04 7:36 ` Eli Zaretskii
2018-12-04 23:28 ` Juri Linkov
2018-12-05 7:25 ` Eli Zaretskii
2018-12-05 23:35 ` Juri Linkov
2018-12-12 23:17 ` Juri Linkov
2018-12-14 9:13 ` Eli Zaretskii [this message]
2018-12-16 23:27 ` Juri Linkov
2018-12-17 16:13 ` Eli Zaretskii
2018-12-17 23:11 ` Juri Linkov
2018-12-18 0:14 ` Juri Linkov
2018-12-18 15:55 ` Dmitry Gutov
2018-12-18 22:35 ` Juri Linkov
2018-12-18 23:33 ` Dmitry Gutov
2018-12-19 0:11 ` Juri Linkov
2018-12-19 0:48 ` Dmitry Gutov
2018-12-19 1:35 ` Dmitry Gutov
2018-12-19 21:49 ` Juri Linkov
2018-12-19 22:50 ` Dmitry Gutov
2018-12-20 22:00 ` Juri Linkov
2018-12-24 2:29 ` Dmitry Gutov
2018-12-25 20:35 ` Juri Linkov
2018-12-25 21:15 ` Dmitry Gutov
2018-12-26 22:49 ` Juri Linkov
2018-12-26 23:16 ` Dmitry Gutov
2018-12-27 0:18 ` Juri Linkov
2018-12-27 0:45 ` Dmitry Gutov
2018-12-27 3:34 ` Eli Zaretskii
2018-12-27 3:32 ` Eli Zaretskii
2018-12-19 21:51 ` Juri Linkov
2018-12-20 0:11 ` Dmitry Gutov
2018-12-20 21:50 ` Juri Linkov
2018-12-20 1:15 ` Dmitry Gutov
2018-12-20 22:17 ` Juri Linkov
2018-12-25 20:39 ` Juri Linkov
2018-12-26 1:40 ` Dmitry Gutov
2018-12-26 22:59 ` Juri Linkov
2018-12-26 23:56 ` Dmitry Gutov
2018-12-27 20:39 ` Juri Linkov
2018-12-29 23:07 ` Juri Linkov
2018-12-30 23:07 ` Dmitry Gutov
2018-12-26 0:43 ` Dmitry Gutov
2018-12-03 11:24 ` Dmitry Gutov
2018-12-03 23:24 ` Juri Linkov
2018-12-04 0:20 ` Dmitry Gutov
2018-12-04 6:46 ` Eli Zaretskii
2018-12-04 22:58 ` Juri Linkov
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=834lbgh3n7.fsf@gnu.org \
--to=eliz@gnu.org \
--cc=33567@debbugs.gnu.org \
--cc=juri@linkov.net \
/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).