Skip to content

Commit d3d3410

Browse files
committed
Bug 573797: Always use sendString, regardless of encoding
This removes a TODO in the code that makes no sense, and in most cases the else branch is not taken as a common operating mode is the default charset/encoding is windows-1252 but the current charset is utf-8. The effective difference between the two branches is that the else does a flush after character rather than after each string. Change-Id: I50b3cc5837d783ba20b88c2efa44d9c4e6381d30
1 parent 9493fbc commit d3d3410

File tree

2 files changed

+2
-9
lines changed

2 files changed

+2
-9
lines changed

terminal/plugins/org.eclipse.tm.terminal.control/META-INF/MANIFEST.MF

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
22
Bundle-ManifestVersion: 2
33
Bundle-Name: %pluginName
44
Bundle-SymbolicName: org.eclipse.tm.terminal.control; singleton:=true
5-
Bundle-Version: 5.2.0.qualifier
5+
Bundle-Version: 5.2.100.qualifier
66
Bundle-Activator: org.eclipse.tm.internal.terminal.control.impl.TerminalPlugin
77
Bundle-Vendor: %providerName
88
Bundle-Localization: plugin

terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/internal/terminal/emulator/VT100TerminalControl.java

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -312,14 +312,7 @@ public boolean pasteString(String strText) {
312312
return false;
313313
if (strText == null)
314314
return false;
315-
if (!fEncoding.equals(defaultEncoding)) {
316-
sendString(strText);
317-
} else {
318-
// TODO I do not understand why pasteString would do this here...
319-
for (int i = 0; i < strText.length(); i++) {
320-
sendChar(strText.charAt(i), false);
321-
}
322-
}
315+
sendString(strText);
323316
return true;
324317
}
325318

0 commit comments

Comments
 (0)