Move arabic.h #defines from arabic.h to arabic.c

 - Move arabic_shape() decl from main.h to arabic.h
 - Move arabic_combine() and arabic_maycombine() from mbyte.c to
   arabic.c as these functions use the #defines I moved.
 - Remove the unnecessary include of arabic.h in globals.h
 - Remove include of arabic.c (sic) in main.c (change CMakeLists.txt to compile
   arabic.c normally)

7 files changed, 269 insertions, 280 deletions

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 386eb3f592..8f9320ced9 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -4,7 +4,7 @@ file( GLOB NEOVIM_SOURCES *.c )
 
 foreach(sfile ${NEOVIM_SOURCES})
   get_filename_component(f ${sfile} NAME)
-  if(${f} MATCHES "^(regexp_nfa.c|farsi.c|arabic.c)$")
+  if(${f} MATCHES "^(regexp_nfa.c|farsi.c)$")
     list(APPEND to_remove ${sfile})
   endif()
 endforeach()
diff --git a/src/arabic.c b/src/arabic.c
index 5b324912bd..df97010655 100644
--- a/src/arabic.c
+++ b/src/arabic.c
@@ -1,11 +1,245 @@
 /// @file arabic.c
 ///
-/// Functions for Arabic language
+/// Functions for Arabic language.
+///
+/// Arabic characters are categorized into following types:
+///
+/// Isolated    - iso-8859-6 form         char denoted with  a_*
+/// Initial     - unicode form-B start    char denoted with  a_i_*
+/// Medial      - unicode form-B middle   char denoted with  a_m_*
+/// Final       - unicode form-B final    char denoted with  a_f_*
+/// Stand-Alone - unicode form-B isolated char denoted with  a_s_* (NOT USED)
 ///
-/// Included by main.c, when FEAT_ARABIC & FEAT_GUI is defined.
 
+#include "vim.h"
 #include "arabic.h"
 
+// Arabic ISO-10646-1 character set definition
+
+// Arabic ISO-8859-6 (subset of 10646; 0600 - 06FF)
+#define a_COMMA                         0x060C
+#define a_SEMICOLON                     0x061B
+#define a_QUESTION                      0x061F
+#define a_HAMZA                         0x0621
+#define a_ALEF_MADDA                    0x0622
+#define a_ALEF_HAMZA_ABOVE              0x0623
+#define a_WAW_HAMZA                     0x0624
+#define a_ALEF_HAMZA_BELOW              0x0625
+#define a_YEH_HAMZA                     0x0626
+#define a_ALEF                          0x0627
+#define a_BEH                           0x0628
+#define a_TEH_MARBUTA                   0x0629
+#define a_TEH                           0x062a
+#define a_THEH                          0x062b
+#define a_JEEM                          0x062c
+#define a_HAH                           0x062d
+#define a_KHAH                          0x062e
+#define a_DAL                           0x062f
+#define a_THAL                          0x0630
+#define a_REH                           0x0631
+#define a_ZAIN                          0x0632
+#define a_SEEN                          0x0633
+#define a_SHEEN                         0x0634
+#define a_SAD                           0x0635
+#define a_DAD                           0x0636
+#define a_TAH                           0x0637
+#define a_ZAH                           0x0638
+#define a_AIN                           0x0639
+#define a_GHAIN                         0x063a
+#define a_TATWEEL                       0x0640
+#define a_FEH                           0x0641
+#define a_QAF                           0x0642
+#define a_KAF                           0x0643
+#define a_LAM                           0x0644
+#define a_MEEM                          0x0645
+#define a_NOON                          0x0646
+#define a_HEH                           0x0647
+#define a_WAW                           0x0648
+#define a_ALEF_MAKSURA                  0x0649
+#define a_YEH                           0x064a
+
+#define a_FATHATAN                      0x064b
+#define a_DAMMATAN                      0x064c
+#define a_KASRATAN                      0x064d
+#define a_FATHA                         0x064e
+#define a_DAMMA                         0x064f
+#define a_KASRA                         0x0650
+#define a_SHADDA                        0x0651
+#define a_SUKUN                         0x0652
+
+#define a_MADDA_ABOVE                   0x0653
+#define a_HAMZA_ABOVE                   0x0654
+#define a_HAMZA_BELOW                   0x0655
+
+#define a_ZERO                          0x0660
+#define a_ONE                           0x0661
+#define a_TWO                           0x0662
+#define a_THREE                         0x0663
+#define a_FOUR                          0x0664
+#define a_FIVE                          0x0665
+#define a_SIX                           0x0666
+#define a_SEVEN                         0x0667
+#define a_EIGHT                         0x0668
+#define a_NINE                          0x0669
+#define a_PERCENT                       0x066a
+#define a_DECIMAL                       0x066b
+#define a_THOUSANDS                     0x066c
+#define a_STAR                          0x066d
+#define a_MINI_ALEF                     0x0670
+// Rest of 8859-6 does not relate to Arabic
+
+// Arabic Presentation Form-B (subset of 10646; FE70 - FEFF)
+//
+//  s -> isolated
+//  i -> initial
+//  m -> medial
+//  f -> final
+//
+#define a_s_FATHATAN                    0xfe70
+#define a_m_TATWEEL_FATHATAN            0xfe71
+#define a_s_DAMMATAN                    0xfe72
+
+#define a_s_KASRATAN                    0xfe74
+
+#define a_s_FATHA                       0xfe76
+#define a_m_FATHA                       0xfe77
+#define a_s_DAMMA                       0xfe78
+#define a_m_DAMMA                       0xfe79
+#define a_s_KASRA                       0xfe7a
+#define a_m_KASRA                       0xfe7b
+#define a_s_SHADDA                      0xfe7c
+#define a_m_SHADDA                      0xfe7d
+#define a_s_SUKUN                       0xfe7e
+#define a_m_SUKUN                       0xfe7f
+
+#define a_s_HAMZA                       0xfe80
+#define a_s_ALEF_MADDA                  0xfe81
+#define a_f_ALEF_MADDA                  0xfe82
+#define a_s_ALEF_HAMZA_ABOVE            0xfe83
+#define a_f_ALEF_HAMZA_ABOVE            0xfe84
+#define a_s_WAW_HAMZA                   0xfe85
+#define a_f_WAW_HAMZA                   0xfe86
+#define a_s_ALEF_HAMZA_BELOW            0xfe87
+#define a_f_ALEF_HAMZA_BELOW            0xfe88
+#define a_s_YEH_HAMZA                   0xfe89
+#define a_f_YEH_HAMZA                   0xfe8a
+#define a_i_YEH_HAMZA                   0xfe8b
+#define a_m_YEH_HAMZA                   0xfe8c
+#define a_s_ALEF                        0xfe8d
+#define a_f_ALEF                        0xfe8e
+#define a_s_BEH                         0xfe8f
+#define a_f_BEH                         0xfe90
+#define a_i_BEH                         0xfe91
+#define a_m_BEH                         0xfe92
+#define a_s_TEH_MARBUTA                 0xfe93
+#define a_f_TEH_MARBUTA                 0xfe94
+#define a_s_TEH                         0xfe95
+#define a_f_TEH                         0xfe96
+#define a_i_TEH                         0xfe97
+#define a_m_TEH                         0xfe98
+#define a_s_THEH                        0xfe99
+#define a_f_THEH                        0xfe9a
+#define a_i_THEH                        0xfe9b
+#define a_m_THEH                        0xfe9c
+#define a_s_JEEM                        0xfe9d
+#define a_f_JEEM                        0xfe9e
+#define a_i_JEEM                        0xfe9f
+#define a_m_JEEM                        0xfea0
+#define a_s_HAH                         0xfea1
+#define a_f_HAH                         0xfea2
+#define a_i_HAH                         0xfea3
+#define a_m_HAH                         0xfea4
+#define a_s_KHAH                        0xfea5
+#define a_f_KHAH                        0xfea6
+#define a_i_KHAH                        0xfea7
+#define a_m_KHAH                        0xfea8
+#define a_s_DAL                         0xfea9
+#define a_f_DAL                         0xfeaa
+#define a_s_THAL                        0xfeab
+#define a_f_THAL                        0xfeac
+#define a_s_REH                         0xfead
+#define a_f_REH                         0xfeae
+#define a_s_ZAIN                        0xfeaf
+#define a_f_ZAIN                        0xfeb0
+#define a_s_SEEN                        0xfeb1
+#define a_f_SEEN                        0xfeb2
+#define a_i_SEEN                        0xfeb3
+#define a_m_SEEN                        0xfeb4
+#define a_s_SHEEN                       0xfeb5
+#define a_f_SHEEN                       0xfeb6
+#define a_i_SHEEN                       0xfeb7
+#define a_m_SHEEN                       0xfeb8
+#define a_s_SAD                         0xfeb9
+#define a_f_SAD                         0xfeba
+#define a_i_SAD                         0xfebb
+#define a_m_SAD                         0xfebc
+#define a_s_DAD                         0xfebd
+#define a_f_DAD                         0xfebe
+#define a_i_DAD                         0xfebf
+#define a_m_DAD                         0xfec0
+#define a_s_TAH                         0xfec1
+#define a_f_TAH                         0xfec2
+#define a_i_TAH                         0xfec3
+#define a_m_TAH                         0xfec4
+#define a_s_ZAH                         0xfec5
+#define a_f_ZAH                         0xfec6
+#define a_i_ZAH                         0xfec7
+#define a_m_ZAH                         0xfec8
+#define a_s_AIN                         0xfec9
+#define a_f_AIN                         0xfeca
+#define a_i_AIN                         0xfecb
+#define a_m_AIN                         0xfecc
+#define a_s_GHAIN                       0xfecd
+#define a_f_GHAIN                       0xfece
+#define a_i_GHAIN                       0xfecf
+#define a_m_GHAIN                       0xfed0
+#define a_s_FEH                         0xfed1
+#define a_f_FEH                         0xfed2
+#define a_i_FEH                         0xfed3
+#define a_m_FEH                         0xfed4
+#define a_s_QAF                         0xfed5
+#define a_f_QAF                         0xfed6
+#define a_i_QAF                         0xfed7
+#define a_m_QAF                         0xfed8
+#define a_s_KAF                         0xfed9
+#define a_f_KAF                         0xfeda
+#define a_i_KAF                         0xfedb
+#define a_m_KAF                         0xfedc
+#define a_s_LAM                         0xfedd
+#define a_f_LAM                         0xfede
+#define a_i_LAM                         0xfedf
+#define a_m_LAM                         0xfee0
+#define a_s_MEEM                        0xfee1
+#define a_f_MEEM                        0xfee2
+#define a_i_MEEM                        0xfee3
+#define a_m_MEEM                        0xfee4
+#define a_s_NOON                        0xfee5
+#define a_f_NOON                        0xfee6
+#define a_i_NOON                        0xfee7
+#define a_m_NOON                        0xfee8
+#define a_s_HEH                         0xfee9
+#define a_f_HEH                         0xfeea
+#define a_i_HEH                         0xfeeb
+#define a_m_HEH                         0xfeec
+#define a_s_WAW                         0xfeed
+#define a_f_WAW                         0xfeee
+#define a_s_ALEF_MAKSURA                0xfeef
+#define a_f_ALEF_MAKSURA                0xfef0
+#define a_s_YEH                         0xfef1
+#define a_f_YEH                         0xfef2
+#define a_i_YEH                         0xfef3
+#define a_m_YEH                         0xfef4
+#define a_s_LAM_ALEF_MADDA_ABOVE        0xfef5
+#define a_f_LAM_ALEF_MADDA_ABOVE        0xfef6
+#define a_s_LAM_ALEF_HAMZA_ABOVE        0xfef7
+#define a_f_LAM_ALEF_HAMZA_ABOVE        0xfef8
+#define a_s_LAM_ALEF_HAMZA_BELOW        0xfef9
+#define a_f_LAM_ALEF_HAMZA_BELOW        0xfefa
+#define a_s_LAM_ALEF                    0xfefb
+#define a_f_LAM_ALEF                    0xfefc
+
+#define a_BYTE_ORDER_MARK               0xfeff
+
 static int A_is_a(int cur_c);
 static int A_is_s(int cur_c);
 static int A_is_f(int cur_c);
@@ -1207,6 +1441,34 @@ int arabic_shape(int c, int *ccp, int *c1p, int prev_c, int prev_c1,
 }
 
 /*
+ * Check whether we are dealing with Arabic combining characters.
+ * Note: these are NOT really composing characters!
+ */
+int arabic_combine(
+    int one,                    /* first character */
+    int two                     /* character just after "one" */
+    )
+{
+  if (one == a_LAM)
+    return arabic_maycombine(two);
+  return FALSE;
+}
+
+/*
+ * Check whether we are dealing with a character that could be regarded as an
+ * Arabic combining character, need to check the character before this.
+ */
+int arabic_maycombine(int two)
+{
+  if (p_arshape && !p_tbidi)
+    return two == a_ALEF_MADDA
+      || two == a_ALEF_HAMZA_ABOVE
+      || two == a_ALEF_HAMZA_BELOW
+      || two == a_ALEF;
+  return FALSE;
+}
+
+/*
  * A_firstc_laa returns first character of LAA combination if it exists
  * in: "c" base character
  * in: "c1" first composing character
diff --git a/src/arabic.h b/src/arabic.h
index 2f956195b1..2c435faa5c 100644
--- a/src/arabic.h
+++ b/src/arabic.h
@@ -1,243 +1,10 @@
-/// @file arabic.h
-///
-/// Arabic characters are categorized into following types:
-///
-/// Isolated    - iso-8859-6 form         char denoted with  a_*
-/// Initial     - unicode form-B start    char denoted with  a_i_*
-/// Medial      - unicode form-B middle   char denoted with  a_m_*
-/// Final       - unicode form-B final    char denoted with  a_f_*
-/// Stand-Alone - unicode form-B isolated char denoted with  a_s_* (NOT USED)
-///
-
 #ifndef NEOVIM_ARABIC_H
 #define NEOVIM_ARABIC_H
 
-// Arabic ISO-10646-1 character set definition
-
-// Arabic ISO-8859-6 (subset of 10646; 0600 - 06FF)
-#define a_COMMA                         0x060C
-#define a_SEMICOLON                     0x061B
-#define a_QUESTION                      0x061F
-#define a_HAMZA                         0x0621
-#define a_ALEF_MADDA                    0x0622
-#define a_ALEF_HAMZA_ABOVE              0x0623
-#define a_WAW_HAMZA                     0x0624
-#define a_ALEF_HAMZA_BELOW              0x0625
-#define a_YEH_HAMZA                     0x0626
-#define a_ALEF                          0x0627
-#define a_BEH                           0x0628
-#define a_TEH_MARBUTA                   0x0629
-#define a_TEH                           0x062a
-#define a_THEH                          0x062b
-#define a_JEEM                          0x062c
-#define a_HAH                           0x062d
-#define a_KHAH                          0x062e
-#define a_DAL                           0x062f
-#define a_THAL                          0x0630
-#define a_REH                           0x0631
-#define a_ZAIN                          0x0632
-#define a_SEEN                          0x0633
-#define a_SHEEN                         0x0634
-#define a_SAD                           0x0635
-#define a_DAD                           0x0636
-#define a_TAH                           0x0637
-#define a_ZAH                           0x0638
-#define a_AIN                           0x0639
-#define a_GHAIN                         0x063a
-#define a_TATWEEL                       0x0640
-#define a_FEH                           0x0641
-#define a_QAF                           0x0642
-#define a_KAF                           0x0643
-#define a_LAM                           0x0644
-#define a_MEEM                          0x0645
-#define a_NOON                          0x0646
-#define a_HEH                           0x0647
-#define a_WAW                           0x0648
-#define a_ALEF_MAKSURA                  0x0649
-#define a_YEH                           0x064a
-
-#define a_FATHATAN                      0x064b
-#define a_DAMMATAN                      0x064c
-#define a_KASRATAN                      0x064d
-#define a_FATHA                         0x064e
-#define a_DAMMA                         0x064f
-#define a_KASRA                         0x0650
-#define a_SHADDA                        0x0651
-#define a_SUKUN                         0x0652
-
-#define a_MADDA_ABOVE                   0x0653
-#define a_HAMZA_ABOVE                   0x0654
-#define a_HAMZA_BELOW                   0x0655
-
-#define a_ZERO                          0x0660
-#define a_ONE                           0x0661
-#define a_TWO                           0x0662
-#define a_THREE                         0x0663
-#define a_FOUR                          0x0664
-#define a_FIVE                          0x0665
-#define a_SIX                           0x0666
-#define a_SEVEN                         0x0667
-#define a_EIGHT                         0x0668
-#define a_NINE                          0x0669
-#define a_PERCENT                       0x066a
-#define a_DECIMAL                       0x066b
-#define a_THOUSANDS                     0x066c
-#define a_STAR                          0x066d
-#define a_MINI_ALEF                     0x0670
-// Rest of 8859-6 does not relate to Arabic
-
-// Arabic Presentation Form-B (subset of 10646; FE70 - FEFF)
-//
-//  s -> isolated
-//  i -> initial
-//  m -> medial
-//  f -> final
-//
-#define a_s_FATHATAN                    0xfe70
-#define a_m_TATWEEL_FATHATAN            0xfe71
-#define a_s_DAMMATAN                    0xfe72
-
-#define a_s_KASRATAN                    0xfe74
-
-#define a_s_FATHA                       0xfe76
-#define a_m_FATHA                       0xfe77
-#define a_s_DAMMA                       0xfe78
-#define a_m_DAMMA                       0xfe79
-#define a_s_KASRA                       0xfe7a
-#define a_m_KASRA                       0xfe7b
-#define a_s_SHADDA                      0xfe7c
-#define a_m_SHADDA                      0xfe7d
-#define a_s_SUKUN                       0xfe7e
-#define a_m_SUKUN                       0xfe7f
-
-#define a_s_HAMZA                       0xfe80
-#define a_s_ALEF_MADDA                  0xfe81
-#define a_f_ALEF_MADDA                  0xfe82
-#define a_s_ALEF_HAMZA_ABOVE            0xfe83
-#define a_f_ALEF_HAMZA_ABOVE            0xfe84
-#define a_s_WAW_HAMZA                   0xfe85
-#define a_f_WAW_HAMZA                   0xfe86
-#define a_s_ALEF_HAMZA_BELOW            0xfe87
-#define a_f_ALEF_HAMZA_BELOW            0xfe88
-#define a_s_YEH_HAMZA                   0xfe89
-#define a_f_YEH_HAMZA                   0xfe8a
-#define a_i_YEH_HAMZA                   0xfe8b
-#define a_m_YEH_HAMZA                   0xfe8c
-#define a_s_ALEF                        0xfe8d
-#define a_f_ALEF                        0xfe8e
-#define a_s_BEH                         0xfe8f
-#define a_f_BEH                         0xfe90
-#define a_i_BEH                         0xfe91
-#define a_m_BEH                         0xfe92
-#define a_s_TEH_MARBUTA                 0xfe93
-#define a_f_TEH_MARBUTA                 0xfe94
-#define a_s_TEH                         0xfe95
-#define a_f_TEH                         0xfe96
-#define a_i_TEH                         0xfe97
-#define a_m_TEH                         0xfe98
-#define a_s_THEH                        0xfe99
-#define a_f_THEH                        0xfe9a
-#define a_i_THEH                        0xfe9b
-#define a_m_THEH                        0xfe9c
-#define a_s_JEEM                        0xfe9d
-#define a_f_JEEM                        0xfe9e
-#define a_i_JEEM                        0xfe9f
-#define a_m_JEEM                        0xfea0
-#define a_s_HAH                         0xfea1
-#define a_f_HAH                         0xfea2
-#define a_i_HAH                         0xfea3
-#define a_m_HAH                         0xfea4
-#define a_s_KHAH                        0xfea5
-#define a_f_KHAH                        0xfea6
-#define a_i_KHAH                        0xfea7
-#define a_m_KHAH                        0xfea8
-#define a_s_DAL                         0xfea9
-#define a_f_DAL                         0xfeaa
-#define a_s_THAL                        0xfeab
-#define a_f_THAL                        0xfeac
-#define a_s_REH                         0xfead
-#define a_f_REH                         0xfeae
-#define a_s_ZAIN                        0xfeaf
-#define a_f_ZAIN                        0xfeb0
-#define a_s_SEEN                        0xfeb1
-#define a_f_SEEN                        0xfeb2
-#define a_i_SEEN                        0xfeb3
-#define a_m_SEEN                        0xfeb4
-#define a_s_SHEEN                       0xfeb5
-#define a_f_SHEEN                       0xfeb6
-#define a_i_SHEEN                       0xfeb7
-#define a_m_SHEEN                       0xfeb8
-#define a_s_SAD                         0xfeb9
-#define a_f_SAD                         0xfeba
-#define a_i_SAD                         0xfebb
-#define a_m_SAD                         0xfebc
-#define a_s_DAD                         0xfebd
-#define a_f_DAD                         0xfebe
-#define a_i_DAD                         0xfebf
-#define a_m_DAD                         0xfec0
-#define a_s_TAH                         0xfec1
-#define a_f_TAH                         0xfec2
-#define a_i_TAH                         0xfec3
-#define a_m_TAH                         0xfec4
-#define a_s_ZAH                         0xfec5
-#define a_f_ZAH                         0xfec6
-#define a_i_ZAH                         0xfec7
-#define a_m_ZAH                         0xfec8
-#define a_s_AIN                         0xfec9
-#define a_f_AIN                         0xfeca
-#define a_i_AIN                         0xfecb
-#define a_m_AIN                         0xfecc
-#define a_s_GHAIN                       0xfecd
-#define a_f_GHAIN                       0xfece
-#define a_i_GHAIN                       0xfecf
-#define a_m_GHAIN                       0xfed0
-#define a_s_FEH                         0xfed1
-#define a_f_FEH                         0xfed2
-#define a_i_FEH                         0xfed3
-#define a_m_FEH                         0xfed4
-#define a_s_QAF                         0xfed5
-#define a_f_QAF                         0xfed6
-#define a_i_QAF                         0xfed7
-#define a_m_QAF                         0xfed8
-#define a_s_KAF                         0xfed9
-#define a_f_KAF                         0xfeda
-#define a_i_KAF                         0xfedb
-#define a_m_KAF                         0xfedc
-#define a_s_LAM                         0xfedd
-#define a_f_LAM                         0xfede
-#define a_i_LAM                         0xfedf
-#define a_m_LAM                         0xfee0
-#define a_s_MEEM                        0xfee1
-#define a_f_MEEM                        0xfee2
-#define a_i_MEEM                        0xfee3
-#define a_m_MEEM                        0xfee4
-#define a_s_NOON                        0xfee5
-#define a_f_NOON                        0xfee6
-#define a_i_NOON                        0xfee7
-#define a_m_NOON                        0xfee8
-#define a_s_HEH                         0xfee9
-#define a_f_HEH                         0xfeea
-#define a_i_HEH                         0xfeeb
-#define a_m_HEH                         0xfeec
-#define a_s_WAW                         0xfeed
-#define a_f_WAW                         0xfeee
-#define a_s_ALEF_MAKSURA                0xfeef
-#define a_f_ALEF_MAKSURA                0xfef0
-#define a_s_YEH                         0xfef1
-#define a_f_YEH                         0xfef2
-#define a_i_YEH                         0xfef3
-#define a_m_YEH                         0xfef4
-#define a_s_LAM_ALEF_MADDA_ABOVE        0xfef5
-#define a_f_LAM_ALEF_MADDA_ABOVE        0xfef6
-#define a_s_LAM_ALEF_HAMZA_ABOVE        0xfef7
-#define a_f_LAM_ALEF_HAMZA_ABOVE        0xfef8
-#define a_s_LAM_ALEF_HAMZA_BELOW        0xfef9
-#define a_f_LAM_ALEF_HAMZA_BELOW        0xfefa
-#define a_s_LAM_ALEF                    0xfefb
-#define a_f_LAM_ALEF                    0xfefc
-
-#define a_BYTE_ORDER_MARK               0xfeff
-
 int arabic_char(int c);
+int arabic_shape(int c, int *ccp, int *c1p, int prev_c, int prev_c1,
+                 int next_c);
+int arabic_combine(int one, int two);
+int arabic_maycombine(int two);
 
 #endif  // NEOVIM_ARABIC_H
diff --git a/src/globals.h b/src/globals.h
index f6adf0381c..7f8142e322 100644
--- a/src/globals.h
+++ b/src/globals.h
@@ -1136,9 +1136,4 @@ EXTERN char *ignoredp;
  */
 # include "farsi.h"
 
-/*
- * Optional Arabic support. Include it here, so EXTERN and INIT are defined.
- */
-# include "arabic.h"
-
 #endif /* NEOVIM_GLOBALS_H */
diff --git a/src/main.c b/src/main.c
index 759366c5d3..1fec7ffc96 100644
--- a/src/main.c
+++ b/src/main.c
@@ -2399,8 +2399,3 @@ time_msg (
  * When FEAT_FKMAP is defined, also compile the Farsi source code.
  */
 # include "farsi.c"
-
-/*
- * When FEAT_ARABIC is defined, also compile the Arabic source code.
- */
-# include "arabic.c"
diff --git a/src/main.h b/src/main.h
index c37965098d..e0659c9f87 100644
--- a/src/main.h
+++ b/src/main.h
@@ -26,7 +26,5 @@ int F_isalpha(int c);
 int F_isdigit(int c);
 int F_ischar(int c);
 void farsi_fkey(cmdarg_T *cap);
-int arabic_shape(int c, int *ccp, int *c1p, int prev_c, int prev_c1,
-                 int next_c);
 /* vim: set ft=c : */
 #endif /* NEOVIM_MAIN_H */
diff --git a/src/mbyte.c b/src/mbyte.c
index d87a73745a..e6a6994bd9 100644
--- a/src/mbyte.c
+++ b/src/mbyte.c
@@ -1533,34 +1533,6 @@ int mb_cptr2char_adv(char_u **pp)
 }
 
 /*
- * Check whether we are dealing with Arabic combining characters.
- * Note: these are NOT really composing characters!
- */
-int arabic_combine(
-    int one,                    /* first character */
-    int two                     /* character just after "one" */
-    )
-{
-  if (one == a_LAM)
-    return arabic_maycombine(two);
-  return FALSE;
-}
-
-/*
- * Check whether we are dealing with a character that could be regarded as an
- * Arabic combining character, need to check the character before this.
- */
-int arabic_maycombine(int two)
-{
-  if (p_arshape && !p_tbidi)
-    return two == a_ALEF_MADDA
-      || two == a_ALEF_HAMZA_ABOVE
-      || two == a_ALEF_HAMZA_BELOW
-      || two == a_ALEF;
-  return FALSE;
-}
-
-/*
  * Check if the character pointed to by "p2" is a composing character when it
  * comes after "p1".  For Arabic sometimes "ab" is replaced with "c", which
  * behaves like a composing character.