define VTE_USE_GNOME_PTY_HELPER if use of the helper is enabled atvte_0_10_7

* configure.in: define VTE_USE_GNOME_PTY_HELPER if use of the helper is enabled
	at compile-time (enabled by default).
* src/iso2022.c(_vte_iso2022_substitute): force characters received in the
	line-drawing map to have width = 1 (more #99603), so that we can
	distinguish them from line-drawing characters received in eucXX, which
	have width = 2.
* src/vte.c(vte_terminal_insert_char): when mapping from line-drawing to
	gunichars, force a width of 1.
* src/vte.c(vte_terminal_process_incoming): extend the bounding box for updates
	one cell further to the right, in case the cursor is in a cell which
	contains a wide character.
* src/pty.c(_vte_pty_start_helper): spit out a warning if the helper isn't
	installed.
* src/pty.c: don't compile in any gnome-pty-helper-specific code if
	VTE_USE_GNOME_PTY_HELPER isn't defined.

17 files changed, 379 insertions, 237 deletions

diff --git a/ChangeLog b/ChangeLog
index 5525740..d8ea2de 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,20 @@
+2002-12-11  nalin
+	* configure.in: define VTE_USE_GNOME_PTY_HELPER if use of the helper
+	is enabled at compile-time (enabled by default).
+	* src/iso2022.c(_vte_iso2022_substitute): force characters received in
+	the line-drawing map to have width = 1 (more #99603), so that we can
+	distinguish them from line-drawing characters received in eucXX, which
+	have width = 2.
+	* src/vte.c(vte_terminal_insert_char): when mapping from line-drawing
+	to gunichars, force a width of 1.
+	* src/vte.c(vte_terminal_process_incoming): extend the bounding box
+	for updates one cell further to the right, in case the cursor is in
+	a cell which contains a wide character.
+	* src/pty.c(_vte_pty_start_helper): spit out a warning if the helper
+	isn't installed.
+	* src/pty.c: don't compile in any gnome-pty-helper-specific code if
+	VTE_USE_GNOME_PTY_HELPER isn't defined.
+
 2002-12-10  nalin
 	* src/buffer.c, src/buffer.h: centralize buffer length sanity checks,
 	add some utility functions for stuffing things into buffers and pulling
diff --git a/configure.in b/configure.in
index cd19c67..d7b4a88 100644
--- a/configure.in
+++ b/configure.in
@@ -167,6 +167,7 @@ AC_SUBST(GETTEXT_PACKAGE)
 
 AC_ARG_ENABLE(gnome-pty-helper, [  --enable-gnome-pty-helper Build a setuid helper for opening ptys [default=yes]], enable_gnome_pty_helper="$enableval", enable_gnome_pty_helper=yes)
 if test "$enable_gnome_pty_helper" != no; then
+	AC_DEFINE(VTE_USE_GNOME_PTY_HELPER,1,[Define if you intend to use gnome-pty-helper.])
 	AC_CONFIG_SUBDIRS(gnome-pty-helper)
 fi
 
diff --git a/po/cs.po b/po/cs.po
index bf8f355..dd4d436 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: vte VERSION\n"
-"POT-Creation-Date: 2002-12-02 22:01-0500\n"
+"POT-Creation-Date: 2002-12-11 14:57-0500\n"
 "PO-Revision-Date: 2002-09-27 00:18+0200\n"
 "Last-Translator: Miloslav Trmac <mitr@volny.cz>\n"
 "Language-Team: Czech <cs@li.org>\n"
@@ -18,93 +18,98 @@ msgstr ""
 msgid "Error adding `%s' to environment, continuing."
 msgstr "Chyba při přidávání `%s' do prostředí, pokračuji."
 
+#: src/pty.c:792
+#, c-format
+msgid "can not run %s"
+msgstr ""
+
 #: src/reaper.c:107
 msgid "Error creating signal pipe."
 msgstr "Chyba při vytváření signálové roury."
 
-#: src/trie.c:406
+#: src/trie.c:411
 #, c-format
 msgid "Duplicate (%s/%s)!"
 msgstr "Duplikát (%s/%s)!"
 
-#: src/vte.c:1334
+#: src/vte.c:1338
 #, c-format
 msgid "Error compiling regular expression \"%s\"."
 msgstr "Chyba při kompilaci regulárního výrazu \"%s\"."
 
-#: src/vte.c:1842 src/vte.c:1851 src/vte.c:1863 src/vte.c:1881 src/vte.c:1886
-#: src/vte.c:1891
+#: src/vte.c:1846 src/vte.c:1855 src/vte.c:1867 src/vte.c:1885 src/vte.c:1891
+#: src/vte.c:1896
 #, c-format
 msgid "Unable to convert characters from %s to %s."
 msgstr "Nemohu konvertovat znaky z %s do %s."
 
-#: src/vte.c:5301
+#: src/vte.c:5308
 #, c-format
 msgid "Got unexpected (key?) sequence `%s'."
 msgstr "Dostal jsem neočekávanou sekvenci (kláves?) `%s'."
 
-#: src/vte.c:6322
+#: src/vte.c:6524
 #, c-format
 msgid "No handler for control sequence `%s' defined."
 msgstr "Nedefinována žádná obsluha pro řídicí sekvenci `%s'."
 
-#: src/vte.c:6929
+#: src/vte.c:7134
 #, c-format
 msgid "Error reading from child: %s."
 msgstr "Chyba při čtení od potomka: %s."
 
-#: src/vte.c:7095
+#: src/vte.c:7300
 #, c-format
 msgid "Error (%s) converting data for child, dropping."
 msgstr "Chyba (%s) při konverzi dat pro potomka, zahazuji je."
 
-#: src/vte.c:9382
+#: src/vte.c:9571
 #, c-format
 msgid "Using fontset \"%s\", which is missing these character sets: %s."
 msgstr "Používám sadu písem \"%s\", které chybí tyto sady znaků: %s."
 
-#: src/vte.c:9923
+#: src/vte.c:10206
 #, c-format
 msgid "Failed to load Xft font pattern \"%s\", falling back to default font."
 msgstr "Nemohu načíst vzor písma Xft \"%s\", používám implicitní písmo."
 
-#: src/vte.c:9935
+#: src/vte.c:10218
 msgid "Failed to load default Xft font."
 msgstr "Nemohu načíst implicitní písmo Xft."
 
-#: src/vte.c:10028
+#: src/vte.c:10311
 #, c-format
 msgid "Failed to load font set \"%s\", falling back to default font."
 msgstr "Nemohu načíst sadu písem \"%s\", používám implicitní písmo."
 
-#: src/vte.c:10040
+#: src/vte.c:10323
 msgid "Failed to load default font, crashing or behaving abnormally."
 msgstr "Nemohu načíst implicitní písmo, padám nebo se chovám nenormálně."
 
-#: src/vte.c:10303
+#: src/vte.c:10586
 #, c-format
 msgid "Error reading PTY size, using defaults: %s."
 msgstr "Chyba při čtení velikosti PTY, používám implicitní: %s."
 
-#: src/vte.c:10339
+#: src/vte.c:10622
 #, c-format
 msgid "Error setting PTY size: %s."
 msgstr "Chyba při nastavování velikosti PTY: %s."
 
-#: src/vte.c:13078
+#: src/vte.c:13487
 msgid "Error allocating draw, disabling Xft."
 msgstr "Chyba při alokaci kreslení, zakazuji Xft."
 
-#: src/vte.c:13086
+#: src/vte.c:13495
 msgid "Error allocating context, disabling Pango."
 msgstr "Chyba při alokaci kontextu, zakazuji Pango."
 
-#: src/vte.c:13092
+#: src/vte.c:13501
 msgid "Error allocating layout, disabling Pango."
 msgstr "Chyba při alokaci rozložení, zakazuji Pango."
 
 #. Aaargh.  We're screwed.
-#: src/vte.c:14619
+#: src/vte.c:15086
 msgid "g_iconv_open() failed setting word characters"
 msgstr "g_iconv_open() selhal při nastavování znaků slova"
 
diff --git a/po/da.po b/po/da.po
index 6bb496e..005be06 100644
--- a/po/da.po
+++ b/po/da.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: vte\n"
-"POT-Creation-Date: 2002-12-02 22:01-0500\n"
+"POT-Creation-Date: 2002-12-11 14:57-0500\n"
 "PO-Revision-Date: 2002-08-13 22:12+0200\n"
 "Last-Translator: Ole Laursen <olau@hardworking.dk>\n"
 "Language-Team: Danish <dansk@klid.dk>\n"
@@ -19,99 +19,104 @@ msgstr ""
 msgid "Error adding `%s' to environment, continuing."
 msgstr "Fejl ved tilføjelse af '%s' til miljøet, fortsætter."
 
+#: src/pty.c:792
+#, c-format
+msgid "can not run %s"
+msgstr ""
+
 #: src/reaper.c:107
 msgid "Error creating signal pipe."
 msgstr "Fejl ved oprettelse af signaldatakanal."
 
-#: src/trie.c:406
+#: src/trie.c:411
 #, c-format
 msgid "Duplicate (%s/%s)!"
 msgstr "Optræder mere end én gang (%s/%s)!"
 
-#: src/vte.c:1334
+#: src/vte.c:1338
 #, c-format
 msgid "Error compiling regular expression \"%s\"."
 msgstr "Fejl ved oversættelse af regulært udtryk \"%s\"."
 
-#: src/vte.c:1842 src/vte.c:1851 src/vte.c:1863 src/vte.c:1881 src/vte.c:1886
-#: src/vte.c:1891
+#: src/vte.c:1846 src/vte.c:1855 src/vte.c:1867 src/vte.c:1885 src/vte.c:1891
+#: src/vte.c:1896
 #, c-format
 msgid "Unable to convert characters from %s to %s."
 msgstr "Kunne ikke konvertere tegn fra %s til %s."
 
-#: src/vte.c:5301
+#: src/vte.c:5308
 #, c-format
 msgid "Got unexpected (key?) sequence `%s'."
 msgstr "Modtog uventet (taste-?) sekvens '%s'."
 
-#: src/vte.c:6322
+#: src/vte.c:6524
 #, c-format
 msgid "No handler for control sequence `%s' defined."
 msgstr "Ingen håndtering for kontrolsekvensen '%s' er defineret."
 
-#: src/vte.c:6929
+#: src/vte.c:7134
 #, c-format
 msgid "Error reading from child: %s."
 msgstr "Fejl ved læsning fra underproces: %s."
 
-#: src/vte.c:7095
+#: src/vte.c:7300
 #, c-format
 msgid "Error (%s) converting data for child, dropping."
 msgstr "Fejl (%s) ved konvertering af data for underproces, dropper."
 
-#: src/vte.c:9382
+#: src/vte.c:9571
 #, c-format
 msgid "Using fontset \"%s\", which is missing these character sets: %s."
 msgstr "Bruger skrifttypesættet \"%s\" som mangler disse tegnsæt: %s."
 
-#: src/vte.c:9923
+#: src/vte.c:10206
 #, c-format
 msgid "Failed to load Xft font pattern \"%s\", falling back to default font."
 msgstr ""
 "Kunne ikke indlæse Xft-skrifttypemønstret \"%s\", falder tilbage til "
 "standardskrifttypen."
 
-#: src/vte.c:9935
+#: src/vte.c:10218
 msgid "Failed to load default Xft font."
 msgstr "Kunne ikke indlæse standard-Xft-skrifttypen."
 
-#: src/vte.c:10028
+#: src/vte.c:10311
 #, c-format
 msgid "Failed to load font set \"%s\", falling back to default font."
 msgstr ""
 "Kunne ikke indlæse skrifttypesættet \"%s\", falder tilbage til "
 "standardskrifttypen."
 
-#: src/vte.c:10040
+#: src/vte.c:10323
 msgid "Failed to load default font, crashing or behaving abnormally."
 msgstr ""
 "Kunne ikke indlæse standardskrifttypen; vil nu gå ned eller udvise anormal "
 "adfærd."
 
-#: src/vte.c:10303
+#: src/vte.c:10586
 #, c-format
 msgid "Error reading PTY size, using defaults: %s."
 msgstr "Fejl ved indlæsning af PTY-størrelse, bruger standardværdier: %s."
 
-#: src/vte.c:10339
+#: src/vte.c:10622
 #, c-format
 msgid "Error setting PTY size: %s."
 msgstr "Fejl ved angivelse af PTY-størrelse: %s."
 
-#: src/vte.c:13078
+#: src/vte.c:13487
 msgid "Error allocating draw, disabling Xft."
 msgstr "Fejl ved allokering af tegning, deaktiverer Xft."
 
-#: src/vte.c:13086
+#: src/vte.c:13495
 msgid "Error allocating context, disabling Pango."
 msgstr "Fejl ved allokering af kontekst, deaktiverer Pango."
 
-#: src/vte.c:13092
+#: src/vte.c:13501
 msgid "Error allocating layout, disabling Pango."
 msgstr "Fejl ved allokering af layout, deaktiverer Pango."
 
 #. Aaargh.  We're screwed.
-#: src/vte.c:14619
+#: src/vte.c:15086
 msgid "g_iconv_open() failed setting word characters"
 msgstr "g_iconv_open() kunne ikke angive ordtegn"
 
diff --git a/po/de.po b/po/de.po
index 08d4ead..efc77fb 100644
--- a/po/de.po
+++ b/po/de.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: vte HEAD\n"
-"POT-Creation-Date: 2002-12-02 22:01-0500\n"
+"POT-Creation-Date: 2002-12-11 14:57-0500\n"
 "PO-Revision-Date: 2002-08-07 18:12+0100\n"
 "Last-Translator: Christian Neumair <christian-neumair@web.de>\n"
 "Language-Team: German <gnome-de@gnome.org>\n"
@@ -19,100 +19,105 @@ msgstr ""
 msgid "Error adding `%s' to environment, continuing."
 msgstr "Fehler beim Hinzufügen von »%s« zur Umgebung, fortfahren."
 
+#: src/pty.c:792
+#, c-format
+msgid "can not run %s"
+msgstr ""
+
 #: src/reaper.c:107
 msgid "Error creating signal pipe."
 msgstr "Fehler beim Erstellen der Signalweiterleitung."
 
-#: src/trie.c:406
+#: src/trie.c:411
 #, c-format
 msgid "Duplicate (%s/%s)!"
 msgstr "Duplikat (%s/%s)!"
 
-#: src/vte.c:1334
+#: src/vte.c:1338
 #, c-format
 msgid "Error compiling regular expression \"%s\"."
 msgstr "Fehler beim Kompilieren des regulären Ausdrucks »%s«."
 
-#: src/vte.c:1842 src/vte.c:1851 src/vte.c:1863 src/vte.c:1881 src/vte.c:1886
-#: src/vte.c:1891
+#: src/vte.c:1846 src/vte.c:1855 src/vte.c:1867 src/vte.c:1885 src/vte.c:1891
+#: src/vte.c:1896
 #, c-format
 msgid "Unable to convert characters from %s to %s."
 msgstr "Zeichen konnten nicht von %s nach %s konvertiert werden."
 
-#: src/vte.c:5301
+#: src/vte.c:5308
 #, c-format
 msgid "Got unexpected (key?) sequence `%s'."
 msgstr "Unerwartete (Schlüssel?)-Sequenz »%s« erhalten."
 
-#: src/vte.c:6322
+#: src/vte.c:6524
 #, c-format
 msgid "No handler for control sequence `%s' defined."
 msgstr "Kein Handler für Kontrollsequenz »%s« definiert."
 
-#: src/vte.c:6929
+#: src/vte.c:7134
 #, c-format
 msgid "Error reading from child: %s."
 msgstr "Fehler beim Lesen von Kind: %s."
 
-#: src/vte.c:7095
+#: src/vte.c:7300
 #, c-format
 msgid "Error (%s) converting data for child, dropping."
 msgstr "Fehler (%s) beim Konvertieren der Daten für Kind, wird abgebrochen."
 
-#: src/vte.c:9382
+#: src/vte.c:9571
 #, c-format
 msgid "Using fontset \"%s\", which is missing these character sets: %s."
 msgstr ""
 "Schriftsatz »%s« wird verwendet, welchem folgende Zeichensätze fehlen: %s."
 
-#: src/vte.c:9923
+#: src/vte.c:10206
 #, c-format
 msgid "Failed to load Xft font pattern \"%s\", falling back to default font."
 msgstr ""
 "Laden des Xft-Schriftmusters »%s« fehlgeschlagen, Rückfall zur vorgegebenen "
 "Schrift."
 
-#: src/vte.c:9935
+#: src/vte.c:10218
 msgid "Failed to load default Xft font."
 msgstr "Laden der vorgegebenen Xft-Schrift fehlgeschlagen"
 
-#: src/vte.c:10028
+#: src/vte.c:10311
 #, c-format
 msgid "Failed to load font set \"%s\", falling back to default font."
 msgstr ""
 "Laden des Schriftsatzes »%s« fehlgeschlagen, Rückfall zur vorgegebenen "
 "Schrift."
 
-#: src/vte.c:10040
+#: src/vte.c:10323
 msgid "Failed to load default font, crashing or behaving abnormally."
 msgstr ""
 "Laden der vorgebenen Schrift fehlgeschlagen, Absturz oder abnormales "
 "Verhalten."
 
-#: src/vte.c:10303
+#: src/vte.c:10586
 #, c-format
 msgid "Error reading PTY size, using defaults: %s."
 msgstr "Fehler beim Lesen der PTY-Größe, Vorgaben werden verwendet: %s."
 
-#: src/vte.c:10339
+#: src/vte.c:10622
 #, c-format
 msgid "Error setting PTY size: %s."
 msgstr "Fehler beim Festlegen der PTY-Größe: %s."
 
-#: src/vte.c:13078
+#: src/vte.c:13487
 msgid "Error allocating draw, disabling Xft."
 msgstr "Fehler beim Zuweisen der Zeichnung, Xft wird deaktiviert."
 
-#: src/vte.c:13086
+#: src/vte.c:13495
 msgid "Error allocating context, disabling Pango."
 msgstr "Fehler beim Zuweisen des Kontextes, Pango wird deaktiviert."
 
-#: src/vte.c:13092
+#: src/vte.c:13501
 msgid "Error allocating layout, disabling Pango."
 msgstr "Fehler beim Zuweisen des Layouts, Pango wird deaktiviert."
 
 #. Aaargh.  We're screwed.
-#: src/vte.c:14619
+#: src/vte.c:15086
 msgid "g_iconv_open() failed setting word characters"
 msgstr "g_iconv_open() konnte die Zeichen des Wortes nicht festlegen"
 
diff --git a/po/fr.po b/po/fr.po
index 7d9acc7..869d03f 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: vte 0.7.0\n"
-"POT-Creation-Date: 2002-12-02 22:01-0500\n"
+"POT-Creation-Date: 2002-12-11 14:57-0500\n"
 "PO-Revision-Date: 2002-08-02 12:01+0200\n"
 "Last-Translator: Laurent RICHARD <kouran@iespana.es>\n"
 "Language-Team: GNOME French Team <gnomefr@traduc.org>\n"
@@ -18,102 +18,107 @@ msgstr ""
 msgid "Error adding `%s' to environment, continuing."
 msgstr "Erreur lors de l'ajout de « %s » à l'environnement, ignore."
 
+#: src/pty.c:792
+#, c-format
+msgid "can not run %s"
+msgstr ""
+
 #: src/reaper.c:107
 msgid "Error creating signal pipe."
 msgstr "Erreur lors de la création du signal de tube."
 
-#: src/trie.c:406
+#: src/trie.c:411
 #, c-format
 msgid "Duplicate (%s/%s)!"
 msgstr "Dupliquer (%s/%s) ! "
 
-#: src/vte.c:1334
+#: src/vte.c:1338
 #, c-format
 msgid "Error compiling regular expression \"%s\"."
 msgstr "Erreur lors de la compilation de l'expression régulière « %s »."
 
-#: src/vte.c:1842 src/vte.c:1851 src/vte.c:1863 src/vte.c:1881 src/vte.c:1886
-#: src/vte.c:1891
+#: src/vte.c:1846 src/vte.c:1855 src/vte.c:1867 src/vte.c:1885 src/vte.c:1891
+#: src/vte.c:1896
 #, c-format
 msgid "Unable to convert characters from %s to %s."
 msgstr "Impossible de convertir les caractères %s en %s."
 
-#: src/vte.c:5301
+#: src/vte.c:5308
 #, c-format
 msgid "Got unexpected (key?) sequence `%s'."
 msgstr "Séquence (clé ?) imprévue « %s »."
 
-#: src/vte.c:6322
+#: src/vte.c:6524
 #, c-format
 msgid "No handler for control sequence `%s' defined."
 msgstr "Pas de manipulation définie pour la séquence de contrôle « %s »."
 
-#: src/vte.c:6929
+#: src/vte.c:7134
 #, c-format
 msgid "Error reading from child: %s."
 msgstr "Erreur lors de la lecture du fils : « %s »."
 
-#: src/vte.c:7095
+#: src/vte.c:7300
 #, c-format
 msgid "Error (%s) converting data for child, dropping."
 msgstr "Erreur (%s) lors de la conversion de données pour le fils, abandon."
 
-#: src/vte.c:9382
+#: src/vte.c:9571
 #, fuzzy, c-format
 msgid "Using fontset \"%s\", which is missing these character sets: %s."
 msgstr ""
 "Avertissement : utilisation de la police de caractère « %s » dans lequel ces "
 "caractères sont manquants : %s. "
 
-#: src/vte.c:9923
+#: src/vte.c:10206
 #, c-format
 msgid "Failed to load Xft font pattern \"%s\", falling back to default font."
 msgstr ""
 "Échec du chargement du modèle de police Xft « %s », utilisation de la police "
 "par défaut."
 
-#: src/vte.c:9935
+#: src/vte.c:10218
 msgid "Failed to load default Xft font."
 msgstr "Échec du chargement la police Xft par défaut."
 
-#: src/vte.c:10028
+#: src/vte.c:10311
 #, c-format
 msgid "Failed to load font set \"%s\", falling back to default font."
 msgstr ""
 "Échec du chargement du jeu de police « %s », utilisation de la police par "
 "défaut."
 
-#: src/vte.c:10040
+#: src/vte.c:10323
 msgid "Failed to load default font, crashing or behaving abnormally."
 msgstr ""
 "Échec du chargement de la police par défaut, crash ou comportement anormal."
 
-#: src/vte.c:10303
+#: src/vte.c:10586
 #, c-format
 msgid "Error reading PTY size, using defaults: %s."
 msgstr ""
 "Erreur lors de la lecture de la taille PTY, utilisation par défaut : %s."
 
-#: src/vte.c:10339
+#: src/vte.c:10622
 #, c-format
 msgid "Error setting PTY size: %s."
 msgstr "Erreur lors du paramètrage de la taille PTY : « %s »."
 
-#: src/vte.c:13078
+#: src/vte.c:13487
 msgid "Error allocating draw, disabling Xft."
 msgstr "Erreur lors de l'attribution du dessin, désactivation de Xft."
 
-#: src/vte.c:13086
+#: src/vte.c:13495
 msgid "Error allocating context, disabling Pango."
 msgstr "Erreur lors de l'attribution du contexte, désactivation de Pango."
 
-#: src/vte.c:13092
+#: src/vte.c:13501
 msgid "Error allocating layout, disabling Pango."
 msgstr ""
 "Erreur lors de l'attribution de la disposition, désactivation de Pango."
 
 #. Aaargh.  We're screwed.
-#: src/vte.c:14619
+#: src/vte.c:15086
 msgid "g_iconv_open() failed setting word characters"
 msgstr "g_iconv_open() a échoué dans le paramètrage des caractères."
 
diff --git a/po/ms.po b/po/ms.po
index 3bea668..d99e3cf 100644
--- a/po/ms.po
+++ b/po/ms.po
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: profterm HEAD\n"
-"POT-Creation-Date: 2002-12-02 22:01-0500\n"
+"POT-Creation-Date: 2002-12-11 14:57-0500\n"
 "PO-Revision-Date: 2002-11-17 12:59+0800\n"
 "Last-Translator: Hasbullah Bin Pit <sebol@ikhlas.com>\n"
 "Language-Team: ms <sebol@ikhlas.com>\n"
@@ -21,94 +21,99 @@ msgstr ""
 msgid "Error adding `%s' to environment, continuing."
 msgstr "Ralat menambah `%s' ke persekitaran, diteruskan."
 
+#: src/pty.c:792
+#, c-format
+msgid "can not run %s"
+msgstr ""
+
 #: src/reaper.c:107
 msgid "Error creating signal pipe."
 msgstr "Ralat mencipta paip isyarat"
 
-#: src/trie.c:406
+#: src/trie.c:411
 #, c-format
 msgid "Duplicate (%s/%s)!"
 msgstr "Gandakan (%s/%s)!"
 
-#: src/vte.c:1334
+#: src/vte.c:1338
 #, c-format
 msgid "Error compiling regular expression \"%s\"."
 msgstr "Ralat menkompil ungkapan regular \"%s\"."
 
-#: src/vte.c:1842 src/vte.c:1851 src/vte.c:1863 src/vte.c:1881 src/vte.c:1886
-#: src/vte.c:1891
+#: src/vte.c:1846 src/vte.c:1855 src/vte.c:1867 src/vte.c:1885 src/vte.c:1891
+#: src/vte.c:1896
 #, c-format
 msgid "Unable to convert characters from %s to %s."
 msgstr "Tak dapat menukar aksara drpd %s ke %s."
 
-#: src/vte.c:5301
+#: src/vte.c:5308
 #, c-format
 msgid "Got unexpected (key?) sequence `%s'."
 msgstr "Dapat turutan (key?) tanpa diduga `%s'."
 
-#: src/vte.c:6322
+#: src/vte.c:6524
 #, c-format
 msgid "No handler for control sequence `%s' defined."
 msgstr "Tiada pengendali bai turutan kawalan '%s' ditakrif."
 
-#: src/vte.c:6929
+#: src/vte.c:7134
 #, c-format
 msgid "Error reading from child: %s."
 msgstr "Ralat membaca daripada proses anak: %s."
 
-#: src/vte.c:7095
+#: src/vte.c:7300
 #, c-format
 msgid "Error (%s) converting data for child, dropping."
 msgstr "Ralat (%s) menukar data bagi anak, digugurkan."
 
-#: src/vte.c:9382
+#: src/vte.c:9571
 #, c-format
 msgid "Using fontset \"%s\", which is missing these character sets: %s."
 msgstr "Menggunakan fontset \"%s\", dimana ketiadaan set aksara: %s."
 
-#: src/vte.c:9923
+#: src/vte.c:10206
 #, c-format
 msgid "Failed to load Xft font pattern \"%s\", falling back to default font."
 msgstr "Gagal memuatkan corak font Xft \"%s\", kembali ke font default."
 
-#: src/vte.c:9935
+#: src/vte.c:10218
 msgid "Failed to load default Xft font."
 msgstr "Gagal memuatkan font default Xft."
 
-#: src/vte.c:10028
+#: src/vte.c:10311
 #, c-format
 msgid "Failed to load font set \"%s\", falling back to default font."
 msgstr "Gagal memuatkan set font \"%s\", kembali ke font default."
 
-#: src/vte.c:10040
+#: src/vte.c:10323
 msgid "Failed to load default font, crashing or behaving abnormally."
 msgstr ""
 "Gagal memuatkan font default, telah musnah atau berkelakuan tidak normal."
 
-#: src/vte.c:10303
+#: src/vte.c:10586
 #, c-format
 msgid "Error reading PTY size, using defaults: %s."
 msgstr "Ralat membaca saiz PTY, menggunakan default: %s"
 
-#: src/vte.c:10339
+#: src/vte.c:10622
 #, c-format
 msgid "Error setting PTY size: %s."
 msgstr "Ralat menetapkan saiz PTY: %s."
 
-#: src/vte.c:13078
+#: src/vte.c:13487
 msgid "Error allocating draw, disabling Xft."
 msgstr "Ralat memperuntukkan lukisan, mematikan Xft."
 
-#: src/vte.c:13086
+#: src/vte.c:13495
 msgid "Error allocating context, disabling Pango."
 msgstr "Ralat memperuntukkan konteks, mematikan Pango."
 
-#: src/vte.c:13092
+#: src/vte.c:13501
 msgid "Error allocating layout, disabling Pango."
 msgstr "Ralat memperuntukkan susunatur, mematikan Pango."
 
 #. Aaargh.  We're screwed.
-#: src/vte.c:14619
+#: src/vte.c:15086
 msgid "g_iconv_open() failed setting word characters"
 msgstr "g_iconv_open() gagal menetapkan aksara perkataan"
 
diff --git a/po/nl.po b/po/nl.po
index c82e568..d5055df 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: vte\n"
-"POT-Creation-Date: 2002-12-08 06:26+0100\n"
+"POT-Creation-Date: 2002-12-11 14:57-0500\n"
 "PO-Revision-Date: 2002-12-09 23:49+0100\n"
 "Last-Translator: Reinout van Schouwen <reinout@cs.vu.nl>\n"
 "Language-Team: Dutch <vertaling@nl.linux.org>\n"
@@ -19,104 +19,109 @@ msgstr ""
 msgid "Error adding `%s' to environment, continuing."
 msgstr "Er is een fout opgetreden bij toevoegen `%s' aan omgeving. Doorgaan."
 
+#: src/pty.c:792
+#, c-format
+msgid "can not run %s"
+msgstr ""
+
 #: src/reaper.c:107
 msgid "Error creating signal pipe."
 msgstr "Er is een fout opgetreden bij maken van signaal-pipe."
 
-#: src/trie.c:406
+#: src/trie.c:411
 #, c-format
 msgid "Duplicate (%s/%s)!"
 msgstr "Dupliceren (%s/%s)!"
 
-#: src/vte.c:1336
+#: src/vte.c:1338
 #, c-format
 msgid "Error compiling regular expression \"%s\"."
 msgstr "Er is een fout opgetreden bij samenstellen reguliere expressie \"%s\"."
 
-#: src/vte.c:1844 src/vte.c:1853 src/vte.c:1865 src/vte.c:1883 src/vte.c:1888
-#: src/vte.c:1893
+#: src/vte.c:1846 src/vte.c:1855 src/vte.c:1867 src/vte.c:1885 src/vte.c:1891
+#: src/vte.c:1896
 #, c-format
 msgid "Unable to convert characters from %s to %s."
 msgstr "Kan tekens niet converteren van %s naar %s."
 
-#: src/vte.c:5303
+#: src/vte.c:5308
 #, c-format
 msgid "Got unexpected (key?) sequence `%s'."
 msgstr "Onverwachte (toetsenbord?)-combinatie `%s' ontvangen."
 
-#: src/vte.c:6324
+#: src/vte.c:6524
 #, c-format
 msgid "No handler for control sequence `%s' defined."
 msgstr "Geen afhandelaar voor controlecombinatie `%s' gedefinieerd."
 
-#: src/vte.c:6931
+#: src/vte.c:7134
 #, c-format
 msgid "Error reading from child: %s."
 msgstr "Er is een fout opgetreden bij lezen van kind: %s."
 
-#: src/vte.c:7097
+#: src/vte.c:7300
 #, c-format
 msgid "Error (%s) converting data for child, dropping."
 msgstr "Fout (%s) bij converteren gegevens voor kind, laat het vallen."
 
-#: src/vte.c:9384
+#: src/vte.c:9571
 #, c-format
 msgid "Using fontset \"%s\", which is missing these character sets: %s."
 msgstr "Lettertypenset \"%s\" wordt gebruikt, welke deze tekensets mist: %s."
 
-#: src/vte.c:9925
+#: src/vte.c:10206
 #, c-format
 msgid "Failed to load Xft font pattern \"%s\", falling back to default font."
 msgstr ""
 "Laden Xft lettertype patroon \"%s\" mislukt, val terug op standaard "
 "lettertype."
 
-#: src/vte.c:9937
+#: src/vte.c:10218
 msgid "Failed to load default Xft font."
 msgstr "Laden standaard Xft lettertype mislukt."
 
-#: src/vte.c:10030
+#: src/vte.c:10311
 #, c-format
 msgid "Failed to load font set \"%s\", falling back to default font."
 msgstr ""
 "Het laden van lettertypenset \"%s\" is mislukt, terugvallen op standaard "
 "lettertype."
 
-#: src/vte.c:10042
+#: src/vte.c:10323
 msgid "Failed to load default font, crashing or behaving abnormally."
 msgstr ""
 "Het laden van het standaard lettertype is mislukt, het gedrag ervan is "
 "abnormaal."
 
-#: src/vte.c:10305
+#: src/vte.c:10586
 #, c-format
 msgid "Error reading PTY size, using defaults: %s."
 msgstr ""
 "Er is een fout opgetreden bij lezen PTY grootte, standaardwaarden worden "
 "gebruikt: %s."
 
-#: src/vte.c:10341
+#: src/vte.c:10622
 #, c-format
 msgid "Error setting PTY size: %s."
 msgstr "Er is een fout opgetreden bij instellen PTY-grootte: %s."
 
-#: src/vte.c:13080
+#: src/vte.c:13487
 msgid "Error allocating draw, disabling Xft."
 msgstr ""
 "Er is een fout opgetreden bij toewijzing tekenen, Xft wordt uitgeschakeld."
 
-#: src/vte.c:13088
+#: src/vte.c:13495
 msgid "Error allocating context, disabling Pango."
 msgstr ""
 "Er is een fout opgetreden bij toewijzing context, Pango wordt uitgeschakeld."
 
-#: src/vte.c:13094
+#: src/vte.c:13501
 msgid "Error allocating layout, disabling Pango."
 msgstr ""
 "Er is een fout opgetreden bij toewijzing lay-out, Pango wordt uitgeschakeld."
 
 #. Aaargh.  We're screwed.
-#: src/vte.c:14621
+#: src/vte.c:15086
 msgid "g_iconv_open() failed setting word characters"
 msgstr "g_iconv_open() niet geslaagd in instellen woordtekens"
 
diff --git a/po/no.po b/po/no.po
index d8fc00b..38d697a 100644
--- a/po/no.po
+++ b/po/no.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: vte 0.5\n"
-"POT-Creation-Date: 2002-12-02 22:01-0500\n"
+"POT-Creation-Date: 2002-12-11 14:57-0500\n"
 "PO-Revision-Date: 2002-08-25 01:11+0200\n"
 "Last-Translator: Kjartan Maraas <kmaraas@gnome.org>\n"
 "Language-Team: Norwegian <no@li.org>\n"
@@ -18,95 +18,100 @@ msgstr ""
 msgid "Error adding `%s' to environment, continuing."
 msgstr "Feil under tillegg av «%s» i miljøet. Fortsetter."
 
+#: src/pty.c:792
+#, c-format
+msgid "can not run %s"
+msgstr ""
+
 #: src/reaper.c:107
 msgid "Error creating signal pipe."
 msgstr "Feil ved oppretting av signalrør."
 
-#: src/trie.c:406
+#: src/trie.c:411
 #, c-format
 msgid "Duplicate (%s/%s)!"
 msgstr "Duplikat (%s/%s)!"
 
-#: src/vte.c:1334
+#: src/vte.c:1338
 #, c-format
 msgid "Error compiling regular expression \"%s\"."
 msgstr "Feil under sammensetting av regulært uttrykk «%s»."
 
-#: src/vte.c:1842 src/vte.c:1851 src/vte.c:1863 src/vte.c:1881 src/vte.c:1886
-#: src/vte.c:1891
+#: src/vte.c:1846 src/vte.c:1855 src/vte.c:1867 src/vte.c:1885 src/vte.c:1891
+#: src/vte.c:1896
 #, c-format
 msgid "Unable to convert characters from %s to %s."
 msgstr "Kan ikke konvertere tegn fra %s til %s."
 
-#: src/vte.c:5301
+#: src/vte.c:5308
 #, c-format
 msgid "Got unexpected (key?) sequence `%s'."
 msgstr "Mottok uventet (nøkkel?) sekvens «%s»."
 
-#: src/vte.c:6322
+#: src/vte.c:6524
 #, c-format
 msgid "No handler for control sequence `%s' defined."
 msgstr "Ingen håndterer definert for kontrollsekvens «%s»."
 
-#: src/vte.c:6929
+#: src/vte.c:7134
 #, c-format
 msgid "Error reading from child: %s."
 msgstr "Feil under lesing fra underprosess: %s."
 
-#: src/vte.c:7095
+#: src/vte.c:7300
 #, c-format
 msgid "Error (%s) converting data for child, dropping."
 msgstr "Feil (%s) ved konvertering av data for underprosess. Hopper over."
 
-#: src/vte.c:9382
+#: src/vte.c:9571
 #, c-format
 msgid "Using fontset \"%s\", which is missing these character sets: %s."
 msgstr "Bruker fontset «%s» som mangler disse tegnsettene: %s"
 
-#: src/vte.c:9923
+#: src/vte.c:10206
 #, c-format
 msgid "Failed to load Xft font pattern \"%s\", falling back to default font."
 msgstr "Feil under lasting av Xft-skriftmønster «%s». Bruker forvalgt skrift."
 
-#: src/vte.c:9935
+#: src/vte.c:10218
 msgid "Failed to load default Xft font."
 msgstr "Feil under lasting av forvalgt Xft-skrift."
 
-#: src/vte.c:10028
+#: src/vte.c:10311
 #, c-format
 msgid "Failed to load font set \"%s\", falling back to default font."
 msgstr "Feil under lasting av fontset «%s». Bruker forvalgt skrift."
 
-#: src/vte.c:10040
+#: src/vte.c:10323
 msgid "Failed to load default font, crashing or behaving abnormally."
 msgstr ""
 "Feil under lasting av forvalgt skrift. Krasj eller abnormal oppførsel kan "
 "ventes."
 
-#: src/vte.c:10303
+#: src/vte.c:10586
 #, c-format
 msgid "Error reading PTY size, using defaults: %s."
 msgstr "Feil under lesing av PTY-størrelse. Bruker forvalg: %s."
 
-#: src/vte.c:10339
+#: src/vte.c:10622
 #, c-format
 msgid "Error setting PTY size: %s."
 msgstr "Feil under setting av PTY-størrelse: %s."
 
-#: src/vte.c:13078
+#: src/vte.c:13487
 msgid "Error allocating draw, disabling Xft."
 msgstr "Feil under allokering av tegning. Deaktiverer Xft."
 
-#: src/vte.c:13086
+#: src/vte.c:13495
 msgid "Error allocating context, disabling Pango."
 msgstr "Feil under allokering av kontekst. Deaktiverer Pango."
 
-#: src/vte.c:13092
+#: src/vte.c:13501
 msgid "Error allocating layout, disabling Pango."
 msgstr "Feil under allokering av «layout». Deaktiverer Pango."
 
 #. Aaargh.  We're screwed.
-#: src/vte.c:14619
+#: src/vte.c:15086
 msgid "g_iconv_open() failed setting word characters"
 msgstr "g_iconv_open() feilet ved setting av ord-tegn"
 
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 2367626..f23ddfe 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: 2.0\n"
-"POT-Creation-Date: 2002-12-02 22:01-0500\n"
+"POT-Creation-Date: 2002-12-11 14:57-0500\n"
 "PO-Revision-Date: 2002-08-28 18:13-0300\n"
 "Last-Translator: Alexandre Folle de Menezes <afmenez@terra.com.br>\n"
 "Language-Team: Brazilian Portuguese <ldp-br@bazar.conectiva.com.br>\n"
@@ -19,95 +19,100 @@ msgstr ""
 msgid "Error adding `%s' to environment, continuing."
 msgstr "Erro ao adicionar `%s' ao ambiente, continuando."
 
+#: src/pty.c:792
+#, c-format
+msgid "can not run %s"
+msgstr ""
+
 #: src/reaper.c:107
 msgid "Error creating signal pipe."
 msgstr "Erro criando o pipe de sinais."
 
-#: src/trie.c:406
+#: src/trie.c:411
 #, c-format
 msgid "Duplicate (%s/%s)!"
 msgstr "Duplicata (%s/%s)!"
 
-#: src/vte.c:1334
+#: src/vte.c:1338
 #, c-format
 msgid "Error compiling regular expression \"%s\"."
 msgstr "Erro compilando a expressão regular \"%s\"."
 
-#: src/vte.c:1842 src/vte.c:1851 src/vte.c:1863 src/vte.c:1881 src/vte.c:1886
-#: src/vte.c:1891
+#: src/vte.c:1846 src/vte.c:1855 src/vte.c:1867 src/vte.c:1885 src/vte.c:1891
+#: src/vte.c:1896
 #, c-format
 msgid "Unable to convert characters from %s to %s."
 msgstr "Incapaz de converter caracteres de %s para %s."
 
-#: src/vte.c:5301
+#: src/vte.c:5308
 #, c-format
 msgid "Got unexpected (key?) sequence `%s'."
 msgstr "Seqüência (chave?) `%s' inesperada."
 
-#: src/vte.c:6322
+#: src/vte.c:6524
 #, c-format
 msgid "No handler for control sequence `%s' defined."
 msgstr "Nenhum manipulador para seqüência de controle `%s' foi definido."
 
-#: src/vte.c:6929
+#: src/vte.c:7134
 #, c-format
 msgid "Error reading from child: %s."
 msgstr "Erro lendo do filho:  %s."
 
-#: src/vte.c:7095
+#: src/vte.c:7300
 #, c-format
 msgid "Error (%s) converting data for child, dropping."
 msgstr "Erro (%s) convertendo dados para filho, descartando."
 
-#: src/vte.c:9382
+#: src/vte.c:9571
 #, c-format
 msgid "Using fontset \"%s\", which is missing these character sets: %s."
 msgstr ""
 "Usando conjunto de fontes \"%s\", que não tem os seguintes conhuntos de "
 "caracteres: %s."
 
-#: src/vte.c:9923
+#: src/vte.c:10206
 #, c-format
 msgid "Failed to load Xft font pattern \"%s\", falling back to default font."
 msgstr "Falha ao carregar a fonte Xft \"%s\", voltando para a fonte padrão."
 
-#: src/vte.c:9935
+#: src/vte.c:10218
 msgid "Failed to load default Xft font."
 msgstr "Falha ao carregar a fonte Xft padrão."
 
-#: src/vte.c:10028
+#: src/vte.c:10311
 #, c-format
 msgid "Failed to load font set \"%s\", falling back to default font."
 msgstr "Falha ao carregar a fonte \"%s\", voltando para a fonte padrão."
 
-#: src/vte.c:10040
+#: src/vte.c:10323
 msgid "Failed to load default font, crashing or behaving abnormally."
 msgstr "Falha ao carregar a fonte padrão, pendurando ou agindo anormalmente."
 
-#: src/vte.c:10303
+#: src/vte.c:10586
 #, c-format
 msgid "Error reading PTY size, using defaults: %s."
 msgstr "Erro lendo o tamanho PTY, usando padrão: %s."
 
-#: src/vte.c:10339
+#: src/vte.c:10622
 #, c-format
 msgid "Error setting PTY size: %s."
 msgstr "Erro setando o tamanho PTY: %s."
 
-#: src/vte.c:13078
+#: src/vte.c:13487
 msgid "Error allocating draw, disabling Xft."
 msgstr "Erro alocando desenho, desabilitando Xft."
 
-#: src/vte.c:13086
+#: src/vte.c:13495
 msgid "Error allocating context, disabling Pango."
 msgstr "Erro alocando contexto, desabilitando Pango."
 
-#: src/vte.c:13092
+#: src/vte.c:13501
 msgid "Error allocating layout, disabling Pango."
 msgstr "Erro alocando layout, desabilitando Pango."
 
 #. Aaargh.  We're screwed.
-#: src/vte.c:14619
+#: src/vte.c:15086
 msgid "g_iconv_open() failed setting word characters"
 msgstr "g_iconv_open() falhou setando caracteres de palavra"
 
diff --git a/po/sv.po b/po/sv.po
index ef38a58..f929a59 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: vte\n"
-"POT-Creation-Date: 2002-12-02 22:01-0500\n"
+"POT-Creation-Date: 2002-12-11 14:57-0500\n"
 "PO-Revision-Date: 2002-08-07 20:42+0200\n"
 "Last-Translator: Christian Rose <menthos@menthos.com>\n"
 "Language-Team: Swedish <sv@li.org>\n"
@@ -20,100 +20,105 @@ msgstr ""
 msgid "Error adding `%s' to environment, continuing."
 msgstr "Fel vid tillägg av \"%s\" till miljön, fortsätter."
 
+#: src/pty.c:792
+#, c-format
+msgid "can not run %s"
+msgstr ""
+
 #: src/reaper.c:107
 msgid "Error creating signal pipe."
 msgstr "Fel vid skapande av signalrör."
 
-#: src/trie.c:406
+#: src/trie.c:411
 #, c-format
 msgid "Duplicate (%s/%s)!"
 msgstr "Dubbel (%s/%s)!"
 
-#: src/vte.c:1334
+#: src/vte.c:1338
 #, c-format
 msgid "Error compiling regular expression \"%s\"."
 msgstr "Fel vid kompilering av reguljärt uttryck \"%s\"."
 
-#: src/vte.c:1842 src/vte.c:1851 src/vte.c:1863 src/vte.c:1881 src/vte.c:1886
-#: src/vte.c:1891
+#: src/vte.c:1846 src/vte.c:1855 src/vte.c:1867 src/vte.c:1885 src/vte.c:1891
+#: src/vte.c:1896
 #, c-format
 msgid "Unable to convert characters from %s to %s."
 msgstr "Kan inte konvertera tecken från %s till %s."
 
-#: src/vte.c:5301
+#: src/vte.c:5308
 #, c-format
 msgid "Got unexpected (key?) sequence `%s'."
 msgstr "Fick oväntad (tangent?)sekvens \"%s\"."
 
-#: src/vte.c:6322
+#: src/vte.c:6524
 #, c-format
 msgid "No handler for control sequence `%s' defined."
 msgstr "Ingen hanterare för kontrollsekvensen \"%s\" är angiven."
 
-#: src/vte.c:6929
+#: src/vte.c:7134
 #, c-format
 msgid "Error reading from child: %s."
 msgstr "Fel vid läsning från barn: %s."
 
-#: src/vte.c:7095
+#: src/vte.c:7300
 #, c-format
 msgid "Error (%s) converting data for child, dropping."
 msgstr "Fel (%s) vid konvertering av data för barn, kastar."
 
-#: src/vte.c:9382
+#: src/vte.c:9571
 #, c-format
 msgid "Using fontset \"%s\", which is missing these character sets: %s."
 msgstr ""
 "Använder typsnittssamlingen \"%s\", som saknar dessa teckensamlingar: %s."
 
-#: src/vte.c:9923
+#: src/vte.c:10206
 #, c-format
 msgid "Failed to load Xft font pattern \"%s\", falling back to default font."
 msgstr ""
 "Misslyckades med att läsa in XFt-typsnittsmönstret \"%s\", använder "
 "standardtypsnittet."
 
-#: src/vte.c:9935
+#: src/vte.c:10218
 msgid "Failed to load default Xft font."
 msgstr "Misslyckades med att läsa in Xft-standardtypsnittet."
 
-#: src/vte.c:10028
+#: src/vte.c:10311
 #, c-format
 msgid "Failed to load font set \"%s\", falling back to default font."
 msgstr ""
 "Misslyckades med att läsa in typsnittssamlingen \"%s\", använder "
 "standardtypsnittet."
 
-#: src/vte.c:10040
+#: src/vte.c:10323
 msgid "Failed to load default font, crashing or behaving abnormally."
 msgstr ""
 "Misslyckades med att läsa in standardtypsnittet, kraschar eller beter sig "
 "onormalt."
 
-#: src/vte.c:10303
+#: src/vte.c:10586
 #, c-format
 msgid "Error reading PTY size, using defaults: %s."
 msgstr "Fel vid läsande av PTY-storlek, använder standardvärden: %s."
 
-#: src/vte.c:10339
+#: src/vte.c:10622
 #, c-format
 msgid "Error setting PTY size: %s."
 msgstr "Fel vid läsande av PTY-storlek: %s."
 
-#: src/vte.c:13078
+#: src/vte.c:13487
 msgid "Error allocating draw, disabling Xft."
 msgstr "Fel vid allokering av ritbar yta, deaktiverar Xft."
 
-#: src/vte.c:13086
+#: src/vte.c:13495
 msgid "Error allocating context, disabling Pango."
 msgstr "Fel vid allokering av sammanhang, deaktiverar Pango."
 
-#: src/vte.c:13092
+#: src/vte.c:13501
 msgid "Error allocating layout, disabling Pango."
 msgstr "Fel vid allokering av layout, deaktiverar Pango."
 
 #. Aaargh.  We're screwed.
-#: src/vte.c:14619
+#: src/vte.c:15086
 msgid "g_iconv_open() failed setting word characters"
 msgstr "g_iconv_open() misslyckades med att ställa in ordtecken"
 
diff --git a/po/uk.po b/po/uk.po
index d57a35a..18ab4f9 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: vte\n"
-"POT-Creation-Date: 2002-12-09 15:31+0200\n"
+"POT-Creation-Date: 2002-12-11 14:57-0500\n"
 "PO-Revision-Date: 2002-12-09 05:01--500\n"
 "Last-Translator: Yuriy Syrota <rastaman@renome.rovno.ua>\n"
 "Language-Team: Ukrainian <linux@linux.org.ua>\n"
@@ -19,97 +19,104 @@ msgstr ""
 msgid "Error adding `%s' to environment, continuing."
 msgstr "Помилка додавання \"%s\" до середовища, роботу продовжено."
 
+#: src/pty.c:792
+#, c-format
+msgid "can not run %s"
+msgstr ""
+
 #: src/reaper.c:107
 msgid "Error creating signal pipe."
 msgstr "Помилка створення сигнального каналу."
 
-#: src/trie.c:406
+#: src/trie.c:411
 #, c-format
 msgid "Duplicate (%s/%s)!"
 msgstr "Повторення (%s/%s)!"
 
-#: src/vte.c:1336
+#: src/vte.c:1338
 #, c-format
 msgid "Error compiling regular expression \"%s\"."
 msgstr "Помилка компіляції регулярного виразу \"%s\"."
 
-#: src/vte.c:1844
-#: src/vte.c:1853
-#: src/vte.c:1865
-#: src/vte.c:1883
-#: src/vte.c:1888
-#: src/vte.c:1893
+#: src/vte.c:1846 src/vte.c:1855 src/vte.c:1867 src/vte.c:1885 src/vte.c:1891
+#: src/vte.c:1896
 #, c-format
 msgid "Unable to convert characters from %s to %s."
 msgstr "Неможливо перетворити символи з %s у %s."
 
-#: src/vte.c:5303
+#: src/vte.c:5308
 #, c-format
 msgid "Got unexpected (key?) sequence `%s'."
 msgstr "Отримано неочікувану послідовність \"%s\"."
 
-#: src/vte.c:6324
+#: src/vte.c:6524
 #, c-format
 msgid "No handler for control sequence `%s' defined."
 msgstr "Не визначено обробника для керівної послідовності \"%s\"."
 
-#: src/vte.c:6931
+#: src/vte.c:7134
 #, c-format
 msgid "Error reading from child: %s."
 msgstr "Помилка зчитування з нащадка: %s."
 
-#: src/vte.c:7097
+#: src/vte.c:7300
 #, c-format
 msgid "Error (%s) converting data for child, dropping."
 msgstr "Помилка (%s) перетворення даних для нащадка, відкинуто."
 
-#: src/vte.c:9384
+#: src/vte.c:9571
 #, c-format
 msgid "Using fontset \"%s\", which is missing these character sets: %s."
-msgstr "Використовується набір шрифтів \"%s\", який не містить таких наборів символів: %s."
+msgstr ""
+"Використовується набір шрифтів \"%s\", який не містить таких наборів "
+"символів: %s."
 
-#: src/vte.c:9925
+#: src/vte.c:10206
 #, c-format
 msgid "Failed to load Xft font pattern \"%s\", falling back to default font."
-msgstr "Не вдалося завантажити шрифтовий шаблон Xft \"%s\", повернення до початкового шрифту."
+msgstr ""
+"Не вдалося завантажити шрифтовий шаблон Xft \"%s\", повернення до "
+"початкового шрифту."
 
-#: src/vte.c:9937
+#: src/vte.c:10218
 msgid "Failed to load default Xft font."
 msgstr "Не вдалося завантажити початковий шрифт Xft."
 
-#: src/vte.c:10030
+#: src/vte.c:10311
 #, c-format
 msgid "Failed to load font set \"%s\", falling back to default font."
-msgstr "Не вдалося завантажити набір шрифтів \"%s\", повернення до початкового шрифту."
+msgstr ""
+"Не вдалося завантажити набір шрифтів \"%s\", повернення до початкового "
+"шрифту."
 
-#: src/vte.c:10042
+#: src/vte.c:10323
 msgid "Failed to load default font, crashing or behaving abnormally."
-msgstr "Не вдалося завантажити початковий шрифт, збій чи нестандартна поведінка."
+msgstr ""
+"Не вдалося завантажити початковий шрифт, збій чи нестандартна поведінка."
 
-#: src/vte.c:10305
+#: src/vte.c:10586
 #, c-format
 msgid "Error reading PTY size, using defaults: %s."
 msgstr "Помилка зчитування розміру PTY, використання початкових: %s."
 
-#: src/vte.c:10341
+#: src/vte.c:10622
 #, c-format
 msgid "Error setting PTY size: %s."
 msgstr "Помилка встановлення розміру PTY: %s."
 
-#: src/vte.c:13080
+#: src/vte.c:13487
 msgid "Error allocating draw, disabling Xft."
 msgstr "Помилка виділення рисунка, вимкнення Xft."
 
-#: src/vte.c:13088
+#: src/vte.c:13495
 msgid "Error allocating context, disabling Pango."
 msgstr "Помилка виділення контексту, вимкнення Pango."
 
-#: src/vte.c:13094
+#: src/vte.c:13501
 msgid "Error allocating layout, disabling Pango."
 msgstr "Помилка виділення схеми розміщення, вимкнення Pango."
 
 #. Aaargh.  We're screwed.
-#: src/vte.c:14621
+#: src/vte.c:15086
 msgid "g_iconv_open() failed setting word characters"
 msgstr "g_iconv_open() зазнала збою"
-
diff --git a/po/vi.po b/po/vi.po
index 2ffd174..0445d86 100644
--- a/po/vi.po
+++ b/po/vi.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: VTE for Gnome 2\n"
-"POT-Creation-Date: 2002-12-02 22:01-0500\n"
+"POT-Creation-Date: 2002-12-11 14:57-0500\n"
 "PO-Revision-Date: 2002-08-24 19:49+0700\n"
 "Last-Translator: Trinh Minh Thanh <tmthanh@linuxmail.org>\n"
 "Language-Team: Gnome-Vi Team <Gnomevi-list@lists.sourceforge.net>\n"
@@ -19,93 +19,98 @@ msgstr ""
 msgid "Error adding `%s' to environment, continuing."
 msgstr "Lỗi khi thêm `%s' vào môi trường, tiếp tục."
 
+#: src/pty.c:792
+#, c-format
+msgid "can not run %s"
+msgstr ""
+
 #: src/reaper.c:107
 msgid "Error creating signal pipe."
 msgstr "Lỗi khi tạo signal pipe."
 
-#: src/trie.c:406
+#: src/trie.c:411
 #, c-format
 msgid "Duplicate (%s/%s)!"
 msgstr "Nhân đôi (%s/%s)!"
 
-#: src/vte.c:1334
+#: src/vte.c:1338
 #, c-format
 msgid "Error compiling regular expression \"%s\"."
 msgstr "Lỗi khi biên dịch biểu hiện quy tắc \"%s\"."
 
-#: src/vte.c:1842 src/vte.c:1851 src/vte.c:1863 src/vte.c:1881 src/vte.c:1886
-#: src/vte.c:1891
+#: src/vte.c:1846 src/vte.c:1855 src/vte.c:1867 src/vte.c:1885 src/vte.c:1891
+#: src/vte.c:1896
 #, c-format
 msgid "Unable to convert characters from %s to %s."
 msgstr "Không thể chuyển đổi các ký tự từ %s thành %s."
 
-#: src/vte.c:5301
+#: src/vte.c:5308
 #, c-format
 msgid "Got unexpected (key?) sequence `%s'."
 msgstr "Nhận sequence không mong muốn (key?) `%s'."
 
-#: src/vte.c:6322
+#: src/vte.c:6524
 #, c-format
 msgid "No handler for control sequence `%s' defined."
 msgstr "Không có trình quản lý nào được chỉ định cho sequence `%s'."
 
-#: src/vte.c:6929
+#: src/vte.c:7134
 #, c-format
 msgid "Error reading from child: %s."
 msgstr "Lỗi khi đọc từ child: %s."
 
-#: src/vte.c:7095
+#: src/vte.c:7300
 #, c-format
 msgid "Error (%s) converting data for child, dropping."
 msgstr "Lỗi (%s) khi chuyển đổi dữ liệu cho child, bỏ."
 
-#: src/vte.c:9382
+#: src/vte.c:9571
 #, c-format
 msgid "Using fontset \"%s\", which is missing these character sets: %s."
 msgstr "Dùng bộ phông \"%s\" thiếu các bảng mã này: %s."
 
-#: src/vte.c:9923
+#: src/vte.c:10206
 #, c-format
 msgid "Failed to load Xft font pattern \"%s\", falling back to default font."
 msgstr "Không nạp được mẫu phông Xft \"%s\", trở lại với phông mặc định."
 
-#: src/vte.c:9935
+#: src/vte.c:10218
 msgid "Failed to load default Xft font."
 msgstr "Không nạp được phông Xft mặc định."
 
-#: src/vte.c:10028
+#: src/vte.c:10311
 #, c-format
 msgid "Failed to load font set \"%s\", falling back to default font."
 msgstr "Không nạp được bộ phông \"%s\", trở lại với phông mặc định."
 
-#: src/vte.c:10040
+#: src/vte.c:10323
 msgid "Failed to load default font, crashing or behaving abnormally."
 msgstr "Không nạp được phông mặc định, bị crash hay ứng xử bất thường."
 
-#: src/vte.c:10303
+#: src/vte.c:10586
 #, c-format
 msgid "Error reading PTY size, using defaults: %s."
 msgstr "Lỗi khi đọc kích thước PTY, sử dụng mặc định: %s."
 
-#: src/vte.c:10339
+#: src/vte.c:10622
 #, c-format
 msgid "Error setting PTY size: %s."
 msgstr "Lỗi khi lập kích thước PTY: %s."
 
-#: src/vte.c:13078
+#: src/vte.c:13487
 msgid "Error allocating draw, disabling Xft."
 msgstr "Lỗi khi cấp phát draw, tắt Xft."
 
-#: src/vte.c:13086
+#: src/vte.c:13495
 msgid "Error allocating context, disabling Pango."
 msgstr "Lỗi khi cấp phát ngữ cảnh (context), tắt Pango."
 
-#: src/vte.c:13092
+#: src/vte.c:13501
 msgid "Error allocating layout, disabling Pango."
 msgstr "Lỗi khi cấp phát layout, tắt Pango."
 
 #. Aaargh.  We're screwed.
-#: src/vte.c:14619
+#: src/vte.c:15086
 msgid "g_iconv_open() failed setting word characters"
 msgstr "g_iconv_open() không lập được các ký tự cho word"
 
diff --git a/src/iso2022.c b/src/iso2022.c
index 597d0f1..547f89c 100644
--- a/src/iso2022.c
+++ b/src/iso2022.c
@@ -842,6 +842,13 @@ _vte_iso2022_substitute(struct _vte_iso2022 *outside_state,
 				width = 0;
 				break;
 			}
+			/* Override for drawing characters. */
+			if (current_map == '0') {
+				if ((result >= 0x2500) && (result <= 0x257f)) {
+					width = 1;
+				}
+			}
+			/* Save the width if one was set. */
 			if (width != 0) {
 				result = _vte_iso2022_set_width(result, width);
 			}
diff --git a/src/pty.c b/src/pty.c
index cfd19aa..1dd1935 100644
--- a/src/pty.c
+++ b/src/pty.c
@@ -44,7 +44,9 @@
 #include "debug.h"
 #include "pty.h"
 
+#ifdef VTE_USE_GNOME_PTY_HELPER
 #include "../gnome-pty-helper/gnome-pty.h"
+#endif
 
 #ifdef MSG_NOSIGNAL
 #define PTY_RECVMSG_FLAGS MSG_NOSIGNAL
@@ -59,10 +61,12 @@
 #define _(String) String
 #endif
 
+#ifdef VTE_USE_GNOME_PTY_HELPER
 static gboolean _vte_pty_helper_started = FALSE;
 static pid_t _vte_pty_helper_pid = -1;
 static int _vte_pty_helper_tunnel = -1;
 static GTree *_vte_pty_helper_map = NULL;
+#endif
 
 /* Reset the handlers for all known signals to their defaults.  The parent
  * (or one of the libraries it links to) may have changed one to be ignored. */
@@ -763,6 +767,7 @@ _vte_pty_read_ptypair(int tunnel, int *parentfd, int *childfd)
 #endif
 #endif
 
+#ifdef VTE_USE_GNOME_PTY_HELPER
 static void
 _vte_pty_stop_helper(void)
 {
@@ -789,6 +794,10 @@ _vte_pty_start_helper(void)
 	int i, tmp[2], tunnel;
 	/* Sanity check. */
 	if (access(LIBEXECDIR "/gnome-pty-helper", X_OK) != 0) {
+		/* Give the user some clue as to why session logging is not
+		 * going to work (assuming we can open a pty using some other
+		 * method). */
+		g_warning(_("can not run %s"), LIBEXECDIR "/gnome-pty-helper");
 	 	return FALSE;
 	}
 	/* Create a communication link for use with the helper. */
@@ -905,6 +914,7 @@ _vte_pty_open_with_helper(pid_t *child, char **env_add,
 	}
 	return -1;
 }
+#endif
 
 /**
  * _vte_pty_open:
@@ -934,6 +944,7 @@ _vte_pty_open(pid_t *child, char **env_add,
 	      gboolean lastlog, gboolean utmp, gboolean wtmp)
 {
 	int ret = -1;
+#ifdef VTE_USE_GNOME_PTY_HELPER
 	int op = 0;
 	int opmap[8] = {
 		GNOME_PTY_OPEN_NO_DB_UPDATE,		/* 0 0 0 */
@@ -961,6 +972,7 @@ _vte_pty_open(pid_t *child, char **env_add,
 						directory,
 						columns, rows, opmap[op]);
 	}
+#endif
 	if (ret == -1) {
 		ret = _vte_pty_open_unix98(child, env_add, command, argv,
 					   directory, columns, rows);
@@ -983,6 +995,7 @@ _vte_pty_open(pid_t *child, char **env_add,
 void
 _vte_pty_close(int pty)
 {
+#ifdef VTE_USE_GNOME_PTY_HELPER
 	gpointer tag;
 	GnomePtyOps ops;
 	if (_vte_pty_helper_map != NULL) {
@@ -1005,6 +1018,7 @@ _vte_pty_close(int pty)
 				      GINT_TO_POINTER(pty));
 		}
 	}
+#endif
 }
 
 #ifdef PTY_MAIN
diff --git a/src/vte.c b/src/vte.c
index 6cf5608..fc73df2 100644
--- a/src/vte.c
+++ b/src/vte.c
@@ -6136,105 +6136,144 @@ vte_terminal_insert_char(VteTerminal *terminal, gunichar c,
 	/* If we've enabled the special drawing set, map the characters to
 	 * Unicode. */
 	if (screen->defaults.alternate) {
+#ifdef VTE_DEBUG
+		if (_vte_debug_on(VTE_DEBUG_SUBSTITUTION)) {
+			fprintf(stderr, "Attempting charset substitution"
+				"for 0x%04x.\n", c);
+		}
+#endif
 		switch (c) {
 		case 95:
 			c = 0x0020; /* empty space */
+			forced_width = 1;
 			break;
 		case 96:
 			c = 0x25c6; /* diamond */
+			forced_width = 1;
 			break;
 		case 'a':
 			c = 0x2592; /* checkerboard */
+			forced_width = 1;
 			break;
 		case 'b':
 			c = 0x2409; /* ht */
+			forced_width = 1;
 			break;
 		case 'c':
 			c = 0x240c; /*  ff */
+			forced_width = 1;
 			break;
 		case 'd':
 			c = 0x240d; /* cr */
+			forced_width = 1;
 			break;
 		case 'e':
 			c = 0x240a; /* lf */
+			forced_width = 1;
 			break;
 		case 'f':
 			c = 0x00b0; /* degree */
+			forced_width = 1;
 			break;
 		case 'g':
 			c = 0x00b1; /* plus/minus */
+			forced_width = 1;
 			break;
 		case 'h':
 			c = 0x2424; /* nl */
+			forced_width = 1;
 			break;
 		case 'i':
 			c = 0x240b; /* vt */
+			forced_width = 1;
 			break;
 		case 'j':
 			c = 0x2518; /* downright corner */
+			forced_width = 1;
 			break;
 		case 'k':
 			c = 0x2510; /* upright corner */
+			forced_width = 1;
 			break;
 		case 'l':
 			c = 0x250c; /* upleft corner */
+			forced_width = 1;
 			break;
 		case 'm':
 			c = 0x2514; /* downleft corner */
+			forced_width = 1;
 			break;
 		case 'n':
 			c = 0x253c; /* cross */
+			forced_width = 1;
 			break;
 		case 'o':
 			c = 0x23ba; /* scanline 1/9 */
+			forced_width = 1;
 			break;
 		case 'p':
 			c = 0x23bb; /* scanline 3/9 */
+			forced_width = 1;
 			break;
 		case 'q':
 			c = 0x2500; /* horizontal line */
+			forced_width = 1;
 			break;
 		case 'r':
 			c = 0x23bc; /* scanline 7/9 */
+			forced_width = 1;
 			break;
 		case 's':
 			c = 0x23bd; /* scanline 9/9 */
+			forced_width = 1;
 			break;
 		case 't':
 			c = 0x251c; /* left t (points right) */
+			forced_width = 1;
 			break;
 		case 'u':
 			c = 0x2524; /* right t (points left) */
+			forced_width = 1;
 			break;
 		case 'v':
 			c = 0x2534; /* bottom tee (points up) */
+			forced_width = 1;
 			break;
 		case 'w':
 			c = 0x252c; /* top tee (points down) */
+			forced_width = 1;
 			break;
 		case 'x':
 			c = 0x2502; /* vertical line */
+			forced_width = 1;
 			break;
 		case 'y':
 			c = 0x2264; /* <= */
+			forced_width = 1;
 			break;
 		case 'z':
 			c = 0x2265; /* >= */
+			forced_width = 1;
 			break;
 		case '{':
 			c = 0x03c0; /* pi */
+			forced_width = 1;
 			break;
 		case '|':
 			c = 0x2260; /* != */
+			forced_width = 1;
 			break;
 		case '}':
 			c = 0x00a3; /* british pound */
+			forced_width = 1;
 			break;
 		case '~':
 			c = 0x00b7; /* bullet */
+			forced_width = 1;
 			break;
 		case 127:
 			          ; /* delete */
+			forced_width = 1;
 			break;
 		default:
 			break;
@@ -6798,7 +6837,7 @@ vte_terminal_process_incoming(gpointer data)
 	/* Estimate how much of the screen we'll need to update. */
 	bbox_topleft.x = cursor.col;
 	bbox_topleft.y = cursor.row;
-	bbox_bottomright.x = cursor.col;
+	bbox_bottomright.x = cursor.col + 1; /* Assume it's on a wide char. */
 	bbox_bottomright.y = cursor.row;
 
 	/* Try initial substrings. */
@@ -6893,7 +6932,7 @@ vte_terminal_process_incoming(gpointer data)
 		bbox_topleft.y = MIN(bbox_topleft.y,
 				     screen->cursor_current.row);
 		bbox_bottomright.x = MAX(bbox_bottomright.x,
-					 screen->cursor_current.col);
+					 screen->cursor_current.col + 1);
 		bbox_bottomright.y = MAX(bbox_bottomright.y,
 					 screen->cursor_current.row);
 
@@ -13552,7 +13591,7 @@ vte_terminal_paint(GtkWidget *widget, GdkRectangle *area)
 								  TRUE,
 								  col * width - x_offs,
 								  row * height - y_offs,
-								  terminal->char_width,
+								  terminal->char_width * cell->columns,
 								  terminal->char_height,
 								  display,
 								  gdrawable,
@@ -13578,8 +13617,7 @@ vte_terminal_paint(GtkWidget *widget, GdkRectangle *area)
 								height - y_offs,
 								x_offs, y_offs,
 								ascent, FALSE,
-								width *
-								cell->columns,
+								width,
 								height,
 								display,
 								gdrawable,
@@ -13611,7 +13649,8 @@ vte_terminal_paint(GtkWidget *widget, GdkRectangle *area)
 							x_offs,
 							y_offs,
 							ascent, monospaced,
-							terminal->char_width,
+							terminal->char_width *
+							item.columns,
 							terminal->char_height,
 							display, gdrawable, drawable,
 							colormap, visual, ggc, gc,
diff --git a/vte.spec b/vte.spec
index 49dfdf4..182a415 100644
--- a/vte.spec
+++ b/vte.spec
@@ -1,5 +1,5 @@
 Name: vte
-Version: 0.10.6
+Version: 0.10.7
 Release: 1
 Summary: An experimental terminal emulator.
 License: LGPL
@@ -93,9 +93,16 @@ rm -f $RPM_BUILD_ROOT/%{_libdir}/python*/site-packages/*.a
 %{_libdir}/pkgconfig/*
 
 %changelog
-* Mon Dec  9 2002 Nalin Dahyabhai <nalin@redhat.com> 0.10.6-1
+* Wed Dec 11 2002 Nalin Dahyabhai <nalin@redhat.com> 0.10.7-1
+- distinguish line-drawing character set code points from the same code points
+  received from the local encoding
+
+* Tue Dec 10 2002 Nalin Dahyabhai <nalin@redhat.com> 0.10.6-1
 - handle ambiguous-width line-drawing characters
 
+* Tue Dec 10 2002 Nalin Dahyabhai <nalin@redhat.com> 0.10.5-3
+- rebuild
+
 * Mon Dec  9 2002 Nalin Dahyabhai <nalin@redhat.com> 0.10.5-2
 - work around AM_PATH_PYTHON not being multilib-aware