summaryrefslogtreecommitdiff
path: root/src/buffer.c
diff options
context:
space:
mode:
authorNoam Postavsky <npostavs@gmail.com>2019-07-20 22:02:36 -0400
committerNoam Postavsky <npostavs@gmail.com>2019-07-20 22:02:36 -0400
commit6490269becdad96ca4b3b9db0d96dbb04ef2ab6a (patch)
tree20cccad69113acfe3072dcf50a677b06c6d7b4fb /src/buffer.c
parentf02b9e9a6ff701d041ef86afe8b9a92ba8e4fd30 (diff)
parent150bdfe43acde8423612cbff4eafbbb88878b497 (diff)
downloademacs-6490269becdad96ca4b3b9db0d96dbb04ef2ab6a.tar.gz
Merge from emacs-26
150bdfe43a Handle completely undecoded input in term (Bug#29918) 021f32cca1 * doc/misc/forms.texi (Control File Format): Fix a doc error. 76538d09b7 Fix typo in package-alist docstring b2fde4b5e8 * doc/lispref/text.texi (Mode-Specific Indent): Fix a typo... 7e62778548 ; Another minor change in 'bidi-display-reordering's doc s... 4455ddbe56 Improve doc string of 'bidi-display-reordering' 34ee26dd93 Add warning to bidi-display-reordering doc string # Conflicts: # lisp/term.el # test/lisp/term-tests.el
Diffstat (limited to 'src/buffer.c')
-rw-r--r--src/buffer.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/buffer.c b/src/buffer.c
index 209e29f0f19..ea785bbcd70 100644
--- a/src/buffer.c
+++ b/src/buffer.c
@@ -5659,7 +5659,11 @@ This variable is never applied to a way of decoding a file while reading it. */
DEFVAR_PER_BUFFER ("bidi-display-reordering",
&BVAR (current_buffer, bidi_display_reordering), Qnil,
- doc: /* Non-nil means reorder bidirectional text for display in the visual order. */);
+ doc: /* Non-nil means reorder bidirectional text for display in the visual order.
+Setting this to nil is intended for use in debugging the display code.
+Don't set to nil in normal sessions, as that is not supported.
+See also `bidi-paragraph-direction'; setting that non-nil might
+speed up redisplay. */);
DEFVAR_PER_BUFFER ("bidi-paragraph-start-re",
&BVAR (current_buffer, bidi_paragraph_start_re), Qnil,