2 files changed, 9 insertions, 1 deletions

diff --git a/src/bidi.c b/src/bidi.c
index 1430d223313..cb94c4e0d7a 100644
--- a/src/bidi.c
+++ b/src/bidi.c
@@ -404,7 +404,7 @@ bidi_mirror_char (int c)
 static bidi_bracket_type_t
 bidi_paired_bracket_type (int c)
 {
-  if (c == BIDI_EOB)
+  if (c == BIDI_EOB || bidi_inhibit_bpa)
     return BIDI_BRACKET_NONE;
   if (c < 0 || c > MAX_CHAR)
     emacs_abort ();
diff --git a/src/xdisp.c b/src/xdisp.c
index c4d23be4cde..2467b336f4a 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -34839,6 +34839,14 @@ Intended for use during debugging and for testing bidi display;
 see biditest.el in the test suite.  */);
   inhibit_bidi_mirroring = false;
 
+  DEFVAR_BOOL ("bidi-inhibit-bpa", bidi_inhibit_bpa,
+    doc: /* Non-nil means inhibit the Bidirectional Parentheses Algorithm.
+Disabling the BPA makes redisplay faster, but might produce incorrect
+display reordering of bidirectional text with embedded parentheses and
+other bracket characters whose 'paired-bracket' Unicode property is
+non-nil, see `get-char-code-property'.  */);
+  bidi_inhibit_bpa = false;
+
 #ifdef GLYPH_DEBUG
   DEFVAR_BOOL ("inhibit-try-window-id", inhibit_try_window_id,
                doc: /* Inhibit try_window_id display optimization.  */);