diff -r 197238c30630 -r eeb1c0da2126 src/jdk.internal.le/share/classes/jdk/internal/org/jline/terminal/impl/AbstractWindowsTerminal.java --- a/src/jdk.internal.le/share/classes/jdk/internal/org/jline/terminal/impl/AbstractWindowsTerminal.java Mon Nov 04 14:26:18 2019 +0800 +++ b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/terminal/impl/AbstractWindowsTerminal.java Mon Nov 04 09:40:35 2019 +0100 @@ -1,10 +1,10 @@ /* - * Copyright (c) 2002-2018, the original author or authors. + * Copyright (c) 2002-2019, the original author or authors. * * This software is distributable under the BSD license. See the terms of the * BSD license in the documentation provided with this software. * - * http://www.opensource.org/licenses/bsd-license.php + * https://opensource.org/licenses/BSD-3-Clause */ package jdk.internal.org.jline.terminal.impl; @@ -21,12 +21,10 @@ import jdk.internal.org.jline.utils.Signals; import jdk.internal.org.jline.utils.WriterOutputStream; -import java.io.IOError; import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; import java.io.PrintWriter; -import java.io.StringWriter; import java.io.Writer; import java.nio.charset.Charset; import java.nio.charset.StandardCharsets; @@ -50,6 +48,7 @@ public static final String TYPE_WINDOWS = "windows"; public static final String TYPE_WINDOWS_256_COLOR = "windows-256color"; + public static final String TYPE_WINDOWS_CONEMU = "windows-conemu"; public static final String TYPE_WINDOWS_VTP = "windows-vtp"; public static final int ENABLE_VIRTUAL_TERMINAL_PROCESSING = 0x0004; @@ -110,7 +109,7 @@ closer = this::close; ShutdownHooks.add(closer); // ConEMU extended fonts support - if (TYPE_WINDOWS_256_COLOR.equals(getType()) + if (TYPE_WINDOWS_CONEMU.equals(getType()) && !Boolean.getBoolean("org.jline.terminal.conemu.disable-activate")) { writer.write("\u001b[9999E"); writer.flush();