emacs-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

master f97c3f9ced: Merge from origin/emacs-28


From: Stefan Kangas
Subject: master f97c3f9ced: Merge from origin/emacs-28
Date: Wed, 26 Jan 2022 00:48:49 -0500 (EST)

branch: master
commit f97c3f9ced9acc79f71643b846f4afd8615b88b8
Merge: db7de56eef 7eca80b204
Author: Stefan Kangas <stefan@marxist.se>
Commit: Stefan Kangas <stefan@marxist.se>

    Merge from origin/emacs-28
    
    7eca80b204 ; * src/composite.c (syms_of_composite) <auto-composition-...
---
 src/composite.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/composite.c b/src/composite.c
index 711284ba6f..a4db66b92d 100644
--- a/src/composite.c
+++ b/src/composite.c
@@ -2064,7 +2064,8 @@ The default value is the function `compose-chars-after'.  
*/);
 Use the command `auto-composition-mode' to change this variable.
 
 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.  */);
+buffers displayed on a terminal whose type, as reported by `tty-type',
+compares equal to that string.  */);
   Vauto_composition_mode = Qt;
 
   DEFVAR_LISP ("auto-composition-function", Vauto_composition_function,



reply via email to

[Prev in Thread] Current Thread [Next in Thread]