← Back to branch summary

~ubuntu-branches/ubuntu/vivid/vte/vivid

« back to all changes in this revision

Viewing changes to debian/patches/lp621927_set_default_term.patch

  • Committer: Bazaar Package Importer
  • Author(s): Martin Pitt
  • Date: 2011-05-17 13:08:32 UTC
  • mfrom: (1.1.64 upstream) (3.4.6 experimental)
  • Revision ID: james.westby@ubuntu.com-20110517130832-mzsdysrncjfdb5p8
Tags: 1:0.28.0-1ubuntu1
* Drop gir1.2-vte-0.0. We just have two reverse dependencies which will be
  moved to GTK3 and gir1.2-vte-2.90.
* Drop 91_keep_fds.patch. The vte_terminal_forkpty API is deprecated, was
  closed upstream as "wontfix".
* Drop lp621927_set_default_term.patch, fixed upstream in a different way.
* Merge with Debian experimental. Remaining Ubuntu changes:
  - Add 93_add_alt_screen_scroll_toggle.patch: Handle scrolling differently
    when using alternate screen or scrolling is restricted.
  - Add lp246701_scroll_region_updates.patch: Bug fix. (LP #246701)

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/lp621927_set_default_term.patch
1
 
From: Mathieu Trudel-Lapierre <mathieu.trudel-lapierre@canonical.com>
2
 
Subject: Force setting TERM if it's not already existing in the terminal's
3
 
 environment.
4
 
Bug-Ubuntu: http://launchpad.net/bugs/621927
5
 
Last-Update: 2010-10-05
6
 
 
7
 
=== modified file 'src/vte.c'
8
 
Index: vte-0.26.2/src/vte.c
9
 
===================================================================
10
 
--- vte-0.26.2.orig/src/vte.c   2010-11-24 17:30:33.725693001 +1100
11
 
+++ vte-0.26.2/src/vte.c        2010-11-24 17:30:35.965693001 +1100
12
 
@@ -8055,6 +8055,7 @@
13
 
 vte_terminal_init(VteTerminal *terminal)
14
 
 {
15
 
        VteTerminalPrivate *pvt;
16
 
+       char *term_var;
17
 
 
18
 
        _vte_debug_print(VTE_DEBUG_LIFECYCLE, "vte_terminal_init()\n");
19
 
 
20
 
@@ -8128,6 +8129,11 @@
21
 
        pvt->pty_pid = -1;
22
 
         pvt->child_exit_status = 0;
23
 
 
24
 
+        /* Make sure we start with *something* set for TERM */
25
 
+        term_var = g_getenv("TERM");
26
 
+        if (term_var == NULL)
27
 
+                g_setenv("TERM", VTE_DEFAULT_EMULATION, TRUE);
28
 
+
29
 
        /* Scrolling options. */
30
 
        pvt->scroll_on_keystroke = TRUE;
31
 
         pvt->scrollback_lines = -1; /* force update in vte_terminal_set_scrollback_lines */