summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--etc/NEWS9
-rw-r--r--src/composite.c4
2 files changed, 11 insertions, 2 deletions
diff --git a/etc/NEWS b/etc/NEWS
index f77fc8243f7..cc779b40f45 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -134,6 +134,15 @@ file:
It used to be enabled when Emacs is started in GUI mode but not when started
in text mode. The cursor still only actually blinks in GUI frames.
+---
+** 'auto-composition-mode' can now be selectively disabled on some TTYs.
+Some text-mode terminals produce display glitches trying to compose
+characters. The 'auto-composition-mode' can now have a string value
+that names a terminal type; if the value returned by the 'tty-type'
+function compares equal with that string, automatic composition will
+be disabled in windows shown on that terminal. The Linux terminal
+sets this up by default.
+
+++
** Etags now supports the Mercury programming language.
See https://mercurylang.org.
diff --git a/src/composite.c b/src/composite.c
index 2bde14776f3..e97f8e2b4cd 100644
--- a/src/composite.c
+++ b/src/composite.c
@@ -2059,8 +2059,8 @@ The default value is the function `compose-chars-after'. */);
doc: /* Non-nil if Auto-Composition mode is enabled.
Use the command `auto-composition-mode' to change this variable.
-If this variable is a string, `auto-composition-mode' will be disabled
-in buffers that have a terminal type that equals this string.*/);
+If this variable is a string, `auto-composition-mode' will be disabled in
+buffers displayed on a terminal whose type compares equal to this string. */);
Vauto_composition_mode = Qt;
DEFVAR_LISP ("auto-composition-function", Vauto_composition_function,