[vte/vte-0-46] emulation: Reset should not switch encoding
- From: Christian Persch <chpe src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [vte/vte-0-46] emulation: Reset should not switch encoding
- Date: Sun, 12 Feb 2017 17:38:20 +0000 (UTC)
commit 3fd7dff4e6c60974aa92aaca15bfa0d80d9377cb
Author: Christian Persch <chpe gnome org>
Date: Sun Feb 12 18:32:42 2017 +0100
emulation: Reset should not switch encoding
https://bugzilla.gnome.org/show_bug.cgi?id=777747
(cherry picked from commit d82fc703c83e1759e73d12273ecf70c13bb5639e)
src/vte.cc | 5 +----
1 files changed, 1 insertions(+), 4 deletions(-)
---
diff --git a/src/vte.cc b/src/vte.cc
index 14f6bf5..ea41588 100644
--- a/src/vte.cc
+++ b/src/vte.cc
@@ -9990,7 +9990,7 @@ VteTerminalPrivate::reset(bool clear_tabstops,
_vte_byte_array_clear(m_outgoing);
/* Reset charset substitution state. */
_vte_iso2022_state_free(m_iso2022);
- m_iso2022 = _vte_iso2022_state_new(NULL);
+ m_iso2022 = _vte_iso2022_state_new(nullptr);
_vte_iso2022_state_set_codeset(m_iso2022,
m_encoding);
/* Reset keypad/cursor key modes. */
@@ -10054,9 +10054,6 @@ VteTerminalPrivate::reset(bool clear_tabstops,
m_cursor_visible = TRUE;
/* For some reason, xterm doesn't reset alternateScroll, but we do. */
m_alternate_screen_scroll = TRUE;
- /* Reset the encoding. */
- set_encoding(nullptr /* UTF-8 */);
- g_assert_cmpstr(m_encoding, ==, "UTF-8");
/* Reset selection. */
deselect_all();
m_has_selection = FALSE;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]