From 12a753a5ca03fe8beddc06201104e785baccb471 Mon Sep 17 00:00:00 2001
From: Bram Moolenaar <Bram@vim.org>
Date: Tue, 23 Oct 2012 05:08:53 +0200
Subject: [PATCH] updated for version 7.3.710 Problem:    Patch 7.3.704 breaks
 "fn". Solution:   Add check for ca.cmdchar. (Christian Brabandt)

---
 src/normal.c  | 2 +-
 src/version.c | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/normal.c b/src/normal.c
index 03a4c453c6..d6773697aa 100644
--- a/src/normal.c
+++ b/src/normal.c
@@ -1086,7 +1086,7 @@ getcount:
 		ca.nchar = ca.extra_char;
 		idx = find_command(ca.cmdchar);
 	    }
-	    else if (ca.nchar == 'n' || ca.nchar == 'N')
+	    else if ((ca.nchar == 'n' || ca.nchar == 'N') && ca.cmdchar == 'g')
 		ca.oap->op_type = get_op_type(*cp, NUL);
 	    else if (*cp == Ctrl_BSL)
 	    {
diff --git a/src/version.c b/src/version.c
index 15be0b87ec..3c774a9f8b 100644
--- a/src/version.c
+++ b/src/version.c
@@ -725,6 +725,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    710,
 /**/
     709,
 /**/
-- 
2.47.3