From a62a2b6250daa1f4043461d0e2358531ad2ee40d Mon Sep 17 00:00:00 2001
From: Anton Ovchinnikov <revolver112@gmail.com>
Date: Sat, 14 Mar 2015 23:20:54 +0100
Subject: [PATCH] Merge consecutive identical 'if' statements

---
 src/nvim/farsi.c  |  9 ---------
 src/nvim/fileio.c | 14 +++++++-------
 2 files changed, 7 insertions(+), 16 deletions(-)

diff --git a/src/nvim/farsi.c b/src/nvim/farsi.c
index db167825ce..2ca581ebd3 100644
--- a/src/nvim/farsi.c
+++ b/src/nvim/farsi.c
@@ -1561,9 +1561,6 @@ int fkmap(int c)
         if (!curwin->w_cursor.col) {
           return ALEF_U_H;
         }
-      }
-
-      if (!p_ri) {
         dec_cursor();
       }
 
@@ -1595,9 +1592,6 @@ int fkmap(int c)
         if (!curwin->w_cursor.col) {
           return ALEF;
         }
-      }
-
-      if (!p_ri) {
         dec_cursor();
       }
 
@@ -1673,9 +1667,6 @@ int fkmap(int c)
         if (!curwin->w_cursor.col) {
           return TEE;
         }
-      }
-
-      if (!p_ri) {
         dec_cursor();
       }
 
diff --git a/src/nvim/fileio.c b/src/nvim/fileio.c
index aab55bda77..9d4c990f3a 100644
--- a/src/nvim/fileio.c
+++ b/src/nvim/fileio.c
@@ -1729,14 +1729,14 @@ failed:
     }
   }
 
-  if (set_options)
-    save_file_ff(curbuf);               /* remember the current file format */
-
-  /* If editing a new file: set 'fenc' for the current buffer.
-   * Also for ":read ++edit file". */
-  if (set_options)
+  if (set_options) {
+    // Remember the current file format.
+    save_file_ff(curbuf);
+    // If editing a new file: set 'fenc' for the current buffer.
+    // Also for ":read ++edit file". 
     set_string_option_direct((char_u *)"fenc", -1, fenc,
-        OPT_FREE|OPT_LOCAL, 0);
+        OPT_FREE | OPT_LOCAL, 0);
+  }
   if (fenc_alloced)
     free(fenc);
 # ifdef USE_ICONV