git@vger.kernel.org list mirror (unofficial, one of many)
 help / color / mirror / code / Atom feed
From: Boxuan Li <liboxuan@connect.hku.hk>
To: git@vger.kernel.org
Cc: avarab@gmail.com, philipoakley@iee.org, gitster@pobox.com,
	j6t@kdbg.org, Boxuan Li <liboxuan@connect.hku.hk>
Subject: [PATCH] userdiff: fix grammar and style issues
Date: Thu, 30 May 2019 00:15:39 +0800	[thread overview]
Message-ID: <20190529161539.47445-1-liboxuan@connect.hku.hk> (raw)
In-Reply-To: <1c31f3fc-9283-91ef-7c96-6eed2f010491@kdbg.org>

Signed-off-by: Boxuan Li <liboxuan@connect.hku.hk>
---
Based on 'next' branch
---
 Documentation/gitattributes.txt | 2 +-
 userdiff.c                      | 6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/Documentation/gitattributes.txt b/Documentation/gitattributes.txt
index ade5e6d400..2796dfc83b 100644
--- a/Documentation/gitattributes.txt
+++ b/Documentation/gitattributes.txt
@@ -819,7 +819,7 @@ patterns are available:
 
 - `java` suitable for source code in the Java language.
 
-- `matlab` suitable for source code in the MATLAB and Octave language.
+- `matlab` suitable for source code in the MATLAB and Octave languages.
 
 - `objc` suitable for source code in the Objective-C language.
 
diff --git a/userdiff.c b/userdiff.c
index 5a3bff3836..a47b24b320 100644
--- a/userdiff.c
+++ b/userdiff.c
@@ -58,9 +58,11 @@ PATTERNS("java",
 	 "|[-+*/<>%&^|=!]="
 	 "|--|\\+\\+|<<=?|>>>?=?|&&|\\|\\|"),
 PATTERNS("matlab",
-	 /* Octave pattern is mostly the same as matlab, except that '%%%' and
+	 /*
+	  * Octave pattern is mostly the same as matlab, except that '%%%' and
 	  * '##' can also be used to begin code sections, in addition to '%%'
-	  * that is understood by both. */
+	  * that is understood by both.
+	  */
 	 "^[[:space:]]*((classdef|function)[[:space:]].*)$|^(%%%?|##)[[:space:]].*$",
 	 "[a-zA-Z_][a-zA-Z0-9_]*|[-+0-9.e]+|[=~<>]=|\\.[*/\\^']|\\|\\||&&"),
 PATTERNS("objc",
-- 
2.21.0.777.g83232e3864


      reply	other threads:[~2019-05-29 16:16 UTC|newest]

Thread overview: 22+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-05-10  0:47 [PATCH] doc/gitattributes: add Octave Boxuan Li
2019-05-10 23:09 ` Philip Oakley
2019-05-10 23:26 ` Ævar Arnfjörð Bjarmason
2019-05-11  2:36   ` LI, BO XUAN
2019-05-11  4:08     ` [PATCH v2] userdiff.c & doc/gitattributes.txt: " Boxuan Li
2019-05-11  4:13     ` [PATCH v3] " Boxuan Li
2019-05-15  5:35       ` Junio C Hamano
2019-05-15  5:57       ` Johannes Sixt
2019-05-15  6:15         ` LI, BO XUAN
2019-05-15 17:46           ` Johannes Sixt
2019-05-16  9:19             ` Junio C Hamano
2019-05-16 19:20               ` Johannes Sixt
2019-05-16 23:33                 ` Junio C Hamano
2019-05-17 12:19                   ` LI, BO XUAN
2019-05-17 19:47                     ` Johannes Sixt
2019-05-15  5:55     ` [PATCH v4] " Boxuan Li
2019-05-18  3:46     ` [PATCH v5] userdiff: " Boxuan Li
2019-05-20 19:26       ` Johannes Sixt
2019-05-21 14:57         ` [PATCH v6] " Boxuan Li
2019-05-28 16:37         ` [PATCH v5] " Junio C Hamano
2019-05-28 20:26           ` Johannes Sixt
2019-05-29 16:15             ` Boxuan Li [this message]

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: http://vger.kernel.org/majordomo-info.html

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20190529161539.47445-1-liboxuan@connect.hku.hk \
    --to=liboxuan@connect.hku.hk \
    --cc=avarab@gmail.com \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    --cc=j6t@kdbg.org \
    --cc=philipoakley@iee.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://80x24.org/mirrors/git.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).