doc fixes. use the older alternate-screen decset value. fixup screwups onvte_0_10_3

* src/vte.h: doc fixes.
* src/dumpkeys.c: use the older alternate-screen decset value.
* src/vte.c: fixup screwups on extending selection.

17 files changed, 211 insertions, 192 deletions

diff --git a/ChangeLog b/ChangeLog
index 6820892f..ee7a6561 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2002-11-07  nalin
+	* src/vte.h: doc fixes.
+	* src/dumpkeys.c: use the older alternate-screen decset value.
+	* src/vte.c: fixup screwups on extending selection.
+
 2002-11-05  nalin
 	* src/vte.c: handle end-of-line selection correctly.  Stop highlighting
 	selection on click, but don't lose it until new text is selected.
diff --git a/Makefile.am b/Makefile.am
index a7098fd1..47c6127c 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -25,8 +25,9 @@ archive:
 	cvs -d $$root export -r $(CVSTAG) $$repo ; \
 	cd $$tmpdir/$$repo ; \
 	./autogen.sh ; \
-	make distcheck ; \
+	make dist ; \
 	cp $(PACKAGE)-$(VERSION).tar.gz $$dir/ ; \
+	rpmbuild -tb $(PACKAGE)-$(VERSION).tar.gz || true ; \
 	rm -fr $$tmpdir
 
 srpm: $(top_srcdir)/$(PACKAGE)-$(VERSION).tar.gz
diff --git a/doc/reference/tmpl/vte.sgml b/doc/reference/tmpl/vte.sgml
index 8936f767..a15989b3 100644
--- a/doc/reference/tmpl/vte.sgml
+++ b/doc/reference/tmpl/vte.sgml
@@ -243,6 +243,17 @@ A VteTerminal is a terminal emulator implemented as a GTK2 widget.
 @background: 
 
 
+<!-- ##### FUNCTION vte_terminal_set_color_dim ##### -->
+<para>
+
+</para>
+
+@terminal: 
+@dim: 
+<!-- # Unused Parameters # -->
+@bold: 
+
+
 <!-- ##### FUNCTION vte_terminal_set_colors ##### -->
 <para>
 
diff --git a/doc/reference/vte-sections.txt b/doc/reference/vte-sections.txt
index d5bcb9d7..4d6918b2 100644
--- a/doc/reference/vte-sections.txt
+++ b/doc/reference/vte-sections.txt
@@ -25,6 +25,7 @@ vte_terminal_set_scroll_on_keystroke
 vte_terminal_set_color_bold
 vte_terminal_set_color_foreground
 vte_terminal_set_color_background
+vte_terminal_set_color_dim
 vte_terminal_set_colors
 vte_terminal_set_default_colors
 vte_terminal_set_background_image
diff --git a/po/cs.po b/po/cs.po
index eae43c49..f8e0b9ee 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-11-04 10:40-0500\n"
+"POT-Creation-Date: 2002-11-07 17:40-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"
@@ -27,88 +27,88 @@ msgstr "Chyba při vytváření signálové roury."
 msgid "Duplicate (%s/%s)!"
 msgstr "Duplikát (%s/%s)!"
 
-#: src/vte.c:1295
+#: src/vte.c:1321
 #, c-format
 msgid "Error compiling regular expression \"%s\"."
 msgstr "Chyba při kompilaci regulárního výrazu \"%s\"."
 
-#: src/vte.c:1802 src/vte.c:1811 src/vte.c:1823 src/vte.c:1841 src/vte.c:1846
-#: src/vte.c:1851
+#: src/vte.c:1828 src/vte.c:1837 src/vte.c:1849 src/vte.c:1867 src/vte.c:1872
+#: src/vte.c:1877
 #, c-format
 msgid "Unable to convert characters from %s to %s."
 msgstr "Nemohu konvertovat znaky z %s do %s."
 
-#: src/vte.c:5147
+#: src/vte.c:5179
 #, c-format
 msgid "Got unexpected (key?) sequence `%s'."
 msgstr "Dostal jsem neočekávanou sekvenci (kláves?) `%s'."
 
-#: src/vte.c:5967
+#: src/vte.c:5999
 #, c-format
 msgid "Character 0x%x is undefined, allocating one column."
 msgstr "Znak 0x%x je nedefinovaný, alokuji jeden sloupec."
 
-#: src/vte.c:6173
+#: src/vte.c:6205
 #, c-format
 msgid "No handler for control sequence `%s' defined."
 msgstr "Nedefinována žádná obsluha pro řídicí sekvenci `%s'."
 
-#: src/vte.c:6780
+#: src/vte.c:6812
 #, c-format
 msgid "Error reading from child: %s."
 msgstr "Chyba při čtení od potomka: %s."
 
-#: src/vte.c:6946
+#: src/vte.c:6978
 #, c-format
 msgid "Error (%s) converting data for child, dropping."
 msgstr "Chyba (%s) při konverzi dat pro potomka, zahazuji je."
 
-#: src/vte.c:9114
+#: src/vte.c:9102
 #, 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:9654
+#: src/vte.c:9642
 #, 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:9666
+#: src/vte.c:9654
 msgid "Failed to load default Xft font."
 msgstr "Nemohu načíst implicitní písmo Xft."
 
-#: src/vte.c:9759
+#: src/vte.c:9747
 #, 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:9771
+#: src/vte.c:9759
 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:10034
+#: src/vte.c:10022
 #, 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:10070
+#: src/vte.c:10058
 #, c-format
 msgid "Error setting PTY size: %s."
 msgstr "Chyba při nastavování velikosti PTY: %s."
 
-#: src/vte.c:12799
+#: src/vte.c:12801
 msgid "Error allocating draw, disabling Xft."
 msgstr "Chyba při alokaci kreslení, zakazuji Xft."
 
-#: src/vte.c:12807
+#: src/vte.c:12809
 msgid "Error allocating context, disabling Pango."
 msgstr "Chyba při alokaci kontextu, zakazuji Pango."
 
-#: src/vte.c:12813
+#: src/vte.c:12815
 msgid "Error allocating layout, disabling Pango."
 msgstr "Chyba při alokaci rozložení, zakazuji Pango."
 
 #. Aaargh.  We're screwed.
-#: src/vte.c:14321
+#: src/vte.c:14342
 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 540a6789..bf32ea87 100644
--- a/po/da.po
+++ b/po/da.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: vte\n"
-"POT-Creation-Date: 2002-11-04 10:40-0500\n"
+"POT-Creation-Date: 2002-11-07 17:40-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"
@@ -28,95 +28,95 @@ msgstr "Fejl ved oprettelse af signaldatakanal."
 msgid "Duplicate (%s/%s)!"
 msgstr "Optræder mere end én gang (%s/%s)!"
 
-#: src/vte.c:1295
+#: src/vte.c:1321
 #, c-format
 msgid "Error compiling regular expression \"%s\"."
 msgstr "Fejl ved oversættelse af regulært udtryk \"%s\"."
 
-#: src/vte.c:1802 src/vte.c:1811 src/vte.c:1823 src/vte.c:1841 src/vte.c:1846
-#: src/vte.c:1851
+#: src/vte.c:1828 src/vte.c:1837 src/vte.c:1849 src/vte.c:1867 src/vte.c:1872
+#: src/vte.c:1877
 #, c-format
 msgid "Unable to convert characters from %s to %s."
 msgstr "Kunne ikke konvertere tegn fra %s til %s."
 
-#: src/vte.c:5147
+#: src/vte.c:5179
 #, c-format
 msgid "Got unexpected (key?) sequence `%s'."
 msgstr "Modtog uventet (taste-?) sekvens '%s'."
 
-#: src/vte.c:5967
+#: src/vte.c:5999
 #, c-format
 msgid "Character 0x%x is undefined, allocating one column."
 msgstr "Tegn 0x%x er ikke defineret, allokerer en kolonne."
 
-#: src/vte.c:6173
+#: src/vte.c:6205
 #, c-format
 msgid "No handler for control sequence `%s' defined."
 msgstr "Ingen håndtering for kontrolsekvensen '%s' er defineret."
 
-#: src/vte.c:6780
+#: src/vte.c:6812
 #, c-format
 msgid "Error reading from child: %s."
 msgstr "Fejl ved læsning fra underproces: %s."
 
-#: src/vte.c:6946
+#: src/vte.c:6978
 #, c-format
 msgid "Error (%s) converting data for child, dropping."
 msgstr "Fejl (%s) ved konvertering af data for underproces, dropper."
 
-#: src/vte.c:9114
+#: src/vte.c:9102
 #, 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:9654
+#: src/vte.c:9642
 #, 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:9666
+#: src/vte.c:9654
 msgid "Failed to load default Xft font."
 msgstr "Kunne ikke indlæse standard-Xft-skrifttypen."
 
-#: src/vte.c:9759
+#: src/vte.c:9747
 #, 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:9771
+#: src/vte.c:9759
 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:10034
+#: src/vte.c:10022
 #, 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:10070
+#: src/vte.c:10058
 #, c-format
 msgid "Error setting PTY size: %s."
 msgstr "Fejl ved angivelse af PTY-størrelse: %s."
 
-#: src/vte.c:12799
+#: src/vte.c:12801
 msgid "Error allocating draw, disabling Xft."
 msgstr "Fejl ved allokering af tegning, deaktiverer Xft."
 
-#: src/vte.c:12807
+#: src/vte.c:12809
 msgid "Error allocating context, disabling Pango."
 msgstr "Fejl ved allokering af kontekst, deaktiverer Pango."
 
-#: src/vte.c:12813
+#: src/vte.c:12815
 msgid "Error allocating layout, disabling Pango."
 msgstr "Fejl ved allokering af layout, deaktiverer Pango."
 
 #. Aaargh.  We're screwed.
-#: src/vte.c:14321
+#: src/vte.c:14342
 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 9177013d..0125a9cd 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-11-04 10:40-0500\n"
+"POT-Creation-Date: 2002-11-07 17:40-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"
@@ -28,96 +28,96 @@ msgstr "Fehler beim Erstellen der Signalweiterleitung."
 msgid "Duplicate (%s/%s)!"
 msgstr "Duplikat (%s/%s)!"
 
-#: src/vte.c:1295
+#: src/vte.c:1321
 #, c-format
 msgid "Error compiling regular expression \"%s\"."
 msgstr "Fehler beim Kompilieren des regulären Ausdrucks »%s«."
 
-#: src/vte.c:1802 src/vte.c:1811 src/vte.c:1823 src/vte.c:1841 src/vte.c:1846
-#: src/vte.c:1851
+#: src/vte.c:1828 src/vte.c:1837 src/vte.c:1849 src/vte.c:1867 src/vte.c:1872
+#: src/vte.c:1877
 #, c-format
 msgid "Unable to convert characters from %s to %s."
 msgstr "Zeichen konnten nicht von %s nach %s konvertiert werden."
 
-#: src/vte.c:5147
+#: src/vte.c:5179
 #, c-format
 msgid "Got unexpected (key?) sequence `%s'."
 msgstr "Unerwartete (Schlüssel?)-Sequenz »%s« erhalten."
 
-#: src/vte.c:5967
+#: src/vte.c:5999
 #, c-format
 msgid "Character 0x%x is undefined, allocating one column."
 msgstr "Zeichen 0x%x ist undefiniert, eine Spalte wird zugewiesen."
 
-#: src/vte.c:6173
+#: src/vte.c:6205
 #, c-format
 msgid "No handler for control sequence `%s' defined."
 msgstr "Kein Handler für Kontrollsequenz »%s« definiert."
 
-#: src/vte.c:6780
+#: src/vte.c:6812
 #, c-format
 msgid "Error reading from child: %s."
 msgstr "Fehler beim Lesen von Kind: %s."
 
-#: src/vte.c:6946
+#: src/vte.c:6978
 #, 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:9114
+#: src/vte.c:9102
 #, 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:9654
+#: src/vte.c:9642
 #, 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:9666
+#: src/vte.c:9654
 msgid "Failed to load default Xft font."
 msgstr "Laden der vorgegebenen Xft-Schrift fehlgeschlagen"
 
-#: src/vte.c:9759
+#: src/vte.c:9747
 #, 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:9771
+#: src/vte.c:9759
 msgid "Failed to load default font, crashing or behaving abnormally."
 msgstr ""
 "Laden der vorgebenen Schrift fehlgeschlagen, Absturz oder abnormales "
 "Verhalten."
 
-#: src/vte.c:10034
+#: src/vte.c:10022
 #, 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:10070
+#: src/vte.c:10058
 #, c-format
 msgid "Error setting PTY size: %s."
 msgstr "Fehler beim Festlegen der PTY-Größe: %s."
 
-#: src/vte.c:12799
+#: src/vte.c:12801
 msgid "Error allocating draw, disabling Xft."
 msgstr "Fehler beim Zuweisen der Zeichnung, Xft wird deaktiviert."
 
-#: src/vte.c:12807
+#: src/vte.c:12809
 msgid "Error allocating context, disabling Pango."
 msgstr "Fehler beim Zuweisen des Kontextes, Pango wird deaktiviert."
 
-#: src/vte.c:12813
+#: src/vte.c:12815
 msgid "Error allocating layout, disabling Pango."
 msgstr "Fehler beim Zuweisen des Layouts, Pango wird deaktiviert."
 
 #. Aaargh.  We're screwed.
-#: src/vte.c:14321
+#: src/vte.c:14342
 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 04063974..67d5e454 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-11-04 10:40-0500\n"
+"POT-Creation-Date: 2002-11-07 17:40-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"
@@ -27,98 +27,98 @@ msgstr "Erreur lors de la création du signal de tube."
 msgid "Duplicate (%s/%s)!"
 msgstr "Dupliquer (%s/%s) ! "
 
-#: src/vte.c:1295
+#: src/vte.c:1321
 #, c-format
 msgid "Error compiling regular expression \"%s\"."
 msgstr "Erreur lors de la compilation de l'expression régulière « %s »."
 
-#: src/vte.c:1802 src/vte.c:1811 src/vte.c:1823 src/vte.c:1841 src/vte.c:1846
-#: src/vte.c:1851
+#: src/vte.c:1828 src/vte.c:1837 src/vte.c:1849 src/vte.c:1867 src/vte.c:1872
+#: src/vte.c:1877
 #, c-format
 msgid "Unable to convert characters from %s to %s."
 msgstr "Impossible de convertir les caractères %s en %s."
 
-#: src/vte.c:5147
+#: src/vte.c:5179
 #, c-format
 msgid "Got unexpected (key?) sequence `%s'."
 msgstr "Séquence (clé ?) imprévue « %s »."
 
-#: src/vte.c:5967
+#: src/vte.c:5999
 #, c-format
 msgid "Character 0x%x is undefined, allocating one column."
 msgstr "Caractère 0x%x non défini, attribution d'une colonne."
 
-#: src/vte.c:6173
+#: src/vte.c:6205
 #, 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:6780
+#: src/vte.c:6812
 #, c-format
 msgid "Error reading from child: %s."
 msgstr "Erreur lors de la lecture du fils : « %s »."
 
-#: src/vte.c:6946
+#: src/vte.c:6978
 #, 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:9114
+#: src/vte.c:9102
 #, 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:9654
+#: src/vte.c:9642
 #, 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:9666
+#: src/vte.c:9654
 msgid "Failed to load default Xft font."
 msgstr "Échec du chargement la police Xft par défaut."
 
-#: src/vte.c:9759
+#: src/vte.c:9747
 #, 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:9771
+#: src/vte.c:9759
 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:10034
+#: src/vte.c:10022
 #, 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:10070
+#: src/vte.c:10058
 #, c-format
 msgid "Error setting PTY size: %s."
 msgstr "Erreur lors du paramètrage de la taille PTY : « %s »."
 
-#: src/vte.c:12799
+#: src/vte.c:12801
 msgid "Error allocating draw, disabling Xft."
 msgstr "Erreur lors de l'attribution du dessin, désactivation de Xft."
 
-#: src/vte.c:12807
+#: src/vte.c:12809
 msgid "Error allocating context, disabling Pango."
 msgstr "Erreur lors de l'attribution du contexte, désactivation de Pango."
 
-#: src/vte.c:12813
+#: src/vte.c:12815
 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:14321
+#: src/vte.c:14342
 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/nl.po b/po/nl.po
index 3ccea762..317ce3f3 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: vte\n"
-"POT-Creation-Date: 2002-11-04 10:40-0500\n"
+"POT-Creation-Date: 2002-11-07 17:40-0500\n"
 "PO-Revision-Date: 2002-08-08 20:09+0200\n"
 "Last-Translator: Taco Witte <T.C.Witte@phys.uu.nl>\n"
 "Language-Team: Dutch <vertaling@nl.linux.org>\n"
@@ -27,97 +27,97 @@ msgstr "Fout bij maken signaal pijp."
 msgid "Duplicate (%s/%s)!"
 msgstr "Dupliceren (%s/%s)!"
 
-#: src/vte.c:1295
+#: src/vte.c:1321
 #, c-format
 msgid "Error compiling regular expression \"%s\"."
 msgstr "Fout bij samenstellen reguliere uitdrukking \"%s\"."
 
-#: src/vte.c:1802 src/vte.c:1811 src/vte.c:1823 src/vte.c:1841 src/vte.c:1846
-#: src/vte.c:1851
+#: src/vte.c:1828 src/vte.c:1837 src/vte.c:1849 src/vte.c:1867 src/vte.c:1872
+#: src/vte.c:1877
 #, c-format
 msgid "Unable to convert characters from %s to %s."
 msgstr "Kan tekens niet converteren van %s naar %s."
 
-#: src/vte.c:5147
+#: src/vte.c:5179
 #, fuzzy, c-format
 msgid "Got unexpected (key?) sequence `%s'."
 msgstr "Ontvangen: onverwachte (toetsenbord?) combinatie `%s'."
 
-#: src/vte.c:5967
+#: src/vte.c:5999
 #, c-format
 msgid "Character 0x%x is undefined, allocating one column."
 msgstr "Teken 0x%x is ongedefinieerd, wijs één kolom toe."
 
-#: src/vte.c:6173
+#: src/vte.c:6205
 #, fuzzy, c-format
 msgid "No handler for control sequence `%s' defined."
 msgstr "Geen afhandelaar voor controle combinatie `%s' gedefinieerd."
 
-#: src/vte.c:6780
+#: src/vte.c:6812
 #, c-format
 msgid "Error reading from child: %s."
 msgstr "Fout bij lezen van kind: %s."
 
-#: src/vte.c:6946
+#: src/vte.c:6978
 #, c-format
 msgid "Error (%s) converting data for child, dropping."
 msgstr "Fout (%s) bij converteren gegevens voor kind, laat het vallen."
 
-#: src/vte.c:9114
+#: src/vte.c:9102
 #, c-format
 msgid "Using fontset \"%s\", which is missing these character sets: %s."
 msgstr ""
 "Lettertype verzameling \"%s\" wordt gebruikt, maar die mist deze tekensets: %"
 "s."
 
-#: src/vte.c:9654
+#: src/vte.c:9642
 #, 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:9666
+#: src/vte.c:9654
 msgid "Failed to load default Xft font."
 msgstr "Laden standaard Xft lettertype mislukt."
 
-#: src/vte.c:9759
+#: src/vte.c:9747
 #, c-format
 msgid "Failed to load font set \"%s\", falling back to default font."
 msgstr ""
 "Fout bij laden lettertype verzameling \"%s\", val terug op standaard "
 "lettertype."
 
-#: src/vte.c:9771
+#: src/vte.c:9759
 msgid "Failed to load default font, crashing or behaving abnormally."
 msgstr ""
 "Fout bij laden standaard lettertype, loop vast of gedraag mezelf abnormaal."
 
-#: src/vte.c:10034
+#: src/vte.c:10022
 #, c-format
 msgid "Error reading PTY size, using defaults: %s."
 msgstr "Fout bij lezen PTY grootte, gebruik standaardwaarden: %s."
 
-#: src/vte.c:10070
+#: src/vte.c:10058
 #, c-format
 msgid "Error setting PTY size: %s."
 msgstr "Fout bij instellen PTY grootte: %s."
 
-#: src/vte.c:12799
+#: src/vte.c:12801
 msgid "Error allocating draw, disabling Xft."
 msgstr "Fout bij toewijzen tekenen, zet Xft uit."
 
-#: src/vte.c:12807
+#: src/vte.c:12809
 msgid "Error allocating context, disabling Pango."
 msgstr "Fout bij toewijzen context, zet Pango uit."
 
-#: src/vte.c:12813
+#: src/vte.c:12815
 #, fuzzy
 msgid "Error allocating layout, disabling Pango."
 msgstr "Fout bij toewijzen layout, zet Pango uit."
 
 #. Aaargh.  We're screwed.
-#: src/vte.c:14321
+#: src/vte.c:14342
 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 cf13f6cf..a366c822 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-11-04 10:40-0500\n"
+"POT-Creation-Date: 2002-11-07 17:40-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"
@@ -27,90 +27,90 @@ msgstr "Feil ved oppretting av signalrør."
 msgid "Duplicate (%s/%s)!"
 msgstr "Duplikat (%s/%s)!"
 
-#: src/vte.c:1295
+#: src/vte.c:1321
 #, c-format
 msgid "Error compiling regular expression \"%s\"."
 msgstr "Feil under sammensetting av regulært uttrykk «%s»."
 
-#: src/vte.c:1802 src/vte.c:1811 src/vte.c:1823 src/vte.c:1841 src/vte.c:1846
-#: src/vte.c:1851
+#: src/vte.c:1828 src/vte.c:1837 src/vte.c:1849 src/vte.c:1867 src/vte.c:1872
+#: src/vte.c:1877
 #, c-format
 msgid "Unable to convert characters from %s to %s."
 msgstr "Kan ikke konvertere tegn fra %s til %s."
 
-#: src/vte.c:5147
+#: src/vte.c:5179
 #, c-format
 msgid "Got unexpected (key?) sequence `%s'."
 msgstr "Mottok uventet (nøkkel?) sekvens «%s»."
 
-#: src/vte.c:5967
+#: src/vte.c:5999
 #, c-format
 msgid "Character 0x%x is undefined, allocating one column."
 msgstr "Tegnet 0x%x er udefinert. Allokerer én kolonne."
 
-#: src/vte.c:6173
+#: src/vte.c:6205
 #, c-format
 msgid "No handler for control sequence `%s' defined."
 msgstr "Ingen håndterer definert for kontrollsekvens «%s»."
 
-#: src/vte.c:6780
+#: src/vte.c:6812
 #, c-format
 msgid "Error reading from child: %s."
 msgstr "Feil under lesing fra underprosess: %s."
 
-#: src/vte.c:6946
+#: src/vte.c:6978
 #, c-format
 msgid "Error (%s) converting data for child, dropping."
 msgstr "Feil (%s) ved konvertering av data for underprosess. Hopper over."
 
-#: src/vte.c:9114
+#: src/vte.c:9102
 #, 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:9654
+#: src/vte.c:9642
 #, 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:9666
+#: src/vte.c:9654
 msgid "Failed to load default Xft font."
 msgstr "Feil under lasting av forvalgt Xft-skrift."
 
-#: src/vte.c:9759
+#: src/vte.c:9747
 #, 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:9771
+#: src/vte.c:9759
 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:10034
+#: src/vte.c:10022
 #, c-format
 msgid "Error reading PTY size, using defaults: %s."
 msgstr "Feil under lesing av PTY-størrelse. Bruker forvalg: %s."
 
-#: src/vte.c:10070
+#: src/vte.c:10058
 #, c-format
 msgid "Error setting PTY size: %s."
 msgstr "Feil under setting av PTY-størrelse: %s."
 
-#: src/vte.c:12799
+#: src/vte.c:12801
 msgid "Error allocating draw, disabling Xft."
 msgstr "Feil under allokering av tegning. Deaktiverer Xft."
 
-#: src/vte.c:12807
+#: src/vte.c:12809
 msgid "Error allocating context, disabling Pango."
 msgstr "Feil under allokering av kontekst. Deaktiverer Pango."
 
-#: src/vte.c:12813
+#: src/vte.c:12815
 msgid "Error allocating layout, disabling Pango."
 msgstr "Feil under allokering av «layout». Deaktiverer Pango."
 
 #. Aaargh.  We're screwed.
-#: src/vte.c:14321
+#: src/vte.c:14342
 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 3bf8e8a0..afc9192f 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-11-04 10:40-0500\n"
+"POT-Creation-Date: 2002-11-07 17:40-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"
@@ -28,90 +28,90 @@ msgstr "Erro criando o pipe de sinais."
 msgid "Duplicate (%s/%s)!"
 msgstr "Duplicata (%s/%s)!"
 
-#: src/vte.c:1295
+#: src/vte.c:1321
 #, c-format
 msgid "Error compiling regular expression \"%s\"."
 msgstr "Erro compilando a expressão regular \"%s\"."
 
-#: src/vte.c:1802 src/vte.c:1811 src/vte.c:1823 src/vte.c:1841 src/vte.c:1846
-#: src/vte.c:1851
+#: src/vte.c:1828 src/vte.c:1837 src/vte.c:1849 src/vte.c:1867 src/vte.c:1872
+#: src/vte.c:1877
 #, c-format
 msgid "Unable to convert characters from %s to %s."
 msgstr "Incapaz de converter caracteres de %s para %s."
 
-#: src/vte.c:5147
+#: src/vte.c:5179
 #, c-format
 msgid "Got unexpected (key?) sequence `%s'."
 msgstr "Seqüência (chave?) `%s' inesperada."
 
-#: src/vte.c:5967
+#: src/vte.c:5999
 #, c-format
 msgid "Character 0x%x is undefined, allocating one column."
 msgstr "O caracter 0x%x é indefinido, alocando uma coluna."
 
-#: src/vte.c:6173
+#: src/vte.c:6205
 #, c-format
 msgid "No handler for control sequence `%s' defined."
 msgstr "Nenhum manipulador para seqüência de controle `%s' foi definido."
 
-#: src/vte.c:6780
+#: src/vte.c:6812
 #, c-format
 msgid "Error reading from child: %s."
 msgstr "Erro lendo do filho:  %s."
 
-#: src/vte.c:6946
+#: src/vte.c:6978
 #, c-format
 msgid "Error (%s) converting data for child, dropping."
 msgstr "Erro (%s) convertendo dados para filho, descartando."
 
-#: src/vte.c:9114
+#: src/vte.c:9102
 #, 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:9654
+#: src/vte.c:9642
 #, 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:9666
+#: src/vte.c:9654
 msgid "Failed to load default Xft font."
 msgstr "Falha ao carregar a fonte Xft padrão."
 
-#: src/vte.c:9759
+#: src/vte.c:9747
 #, 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:9771
+#: src/vte.c:9759
 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:10034
+#: src/vte.c:10022
 #, c-format
 msgid "Error reading PTY size, using defaults: %s."
 msgstr "Erro lendo o tamanho PTY, usando padrão: %s."
 
-#: src/vte.c:10070
+#: src/vte.c:10058
 #, c-format
 msgid "Error setting PTY size: %s."
 msgstr "Erro setando o tamanho PTY: %s."
 
-#: src/vte.c:12799
+#: src/vte.c:12801
 msgid "Error allocating draw, disabling Xft."
 msgstr "Erro alocando desenho, desabilitando Xft."
 
-#: src/vte.c:12807
+#: src/vte.c:12809
 msgid "Error allocating context, disabling Pango."
 msgstr "Erro alocando contexto, desabilitando Pango."
 
-#: src/vte.c:12813
+#: src/vte.c:12815
 msgid "Error allocating layout, disabling Pango."
 msgstr "Erro alocando layout, desabilitando Pango."
 
 #. Aaargh.  We're screwed.
-#: src/vte.c:14321
+#: src/vte.c:14342
 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 2f30a1c4..08df367f 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: vte\n"
-"POT-Creation-Date: 2002-11-04 10:40-0500\n"
+"POT-Creation-Date: 2002-11-07 17:40-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"
@@ -29,96 +29,96 @@ msgstr "Fel vid skapande av signalrör."
 msgid "Duplicate (%s/%s)!"
 msgstr "Dubbel (%s/%s)!"
 
-#: src/vte.c:1295
+#: src/vte.c:1321
 #, c-format
 msgid "Error compiling regular expression \"%s\"."
 msgstr "Fel vid kompilering av reguljärt uttryck \"%s\"."
 
-#: src/vte.c:1802 src/vte.c:1811 src/vte.c:1823 src/vte.c:1841 src/vte.c:1846
-#: src/vte.c:1851
+#: src/vte.c:1828 src/vte.c:1837 src/vte.c:1849 src/vte.c:1867 src/vte.c:1872
+#: src/vte.c:1877
 #, c-format
 msgid "Unable to convert characters from %s to %s."
 msgstr "Kan inte konvertera tecken från %s till %s."
 
-#: src/vte.c:5147
+#: src/vte.c:5179
 #, c-format
 msgid "Got unexpected (key?) sequence `%s'."
 msgstr "Fick oväntad (tangent?)sekvens \"%s\"."
 
-#: src/vte.c:5967
+#: src/vte.c:5999
 #, c-format
 msgid "Character 0x%x is undefined, allocating one column."
 msgstr "Tecknet 0x%x är odefinierat, allokerar en kolumn."
 
-#: src/vte.c:6173
+#: src/vte.c:6205
 #, c-format
 msgid "No handler for control sequence `%s' defined."
 msgstr "Ingen hanterare för kontrollsekvensen \"%s\" är angiven."
 
-#: src/vte.c:6780
+#: src/vte.c:6812
 #, c-format
 msgid "Error reading from child: %s."
 msgstr "Fel vid läsning från barn: %s."
 
-#: src/vte.c:6946
+#: src/vte.c:6978
 #, c-format
 msgid "Error (%s) converting data for child, dropping."
 msgstr "Fel (%s) vid konvertering av data för barn, kastar."
 
-#: src/vte.c:9114
+#: src/vte.c:9102
 #, 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:9654
+#: src/vte.c:9642
 #, 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:9666
+#: src/vte.c:9654
 msgid "Failed to load default Xft font."
 msgstr "Misslyckades med att läsa in Xft-standardtypsnittet."
 
-#: src/vte.c:9759
+#: src/vte.c:9747
 #, 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:9771
+#: src/vte.c:9759
 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:10034
+#: src/vte.c:10022
 #, 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:10070
+#: src/vte.c:10058
 #, c-format
 msgid "Error setting PTY size: %s."
 msgstr "Fel vid läsande av PTY-storlek: %s."
 
-#: src/vte.c:12799
+#: src/vte.c:12801
 msgid "Error allocating draw, disabling Xft."
 msgstr "Fel vid allokering av ritbar yta, deaktiverar Xft."
 
-#: src/vte.c:12807
+#: src/vte.c:12809
 msgid "Error allocating context, disabling Pango."
 msgstr "Fel vid allokering av sammanhang, deaktiverar Pango."
 
-#: src/vte.c:12813
+#: src/vte.c:12815
 msgid "Error allocating layout, disabling Pango."
 msgstr "Fel vid allokering av layout, deaktiverar Pango."
 
 #. Aaargh.  We're screwed.
-#: src/vte.c:14321
+#: src/vte.c:14342
 msgid "g_iconv_open() failed setting word characters"
 msgstr "g_iconv_open() misslyckades med att ställa in ordtecken"
 
diff --git a/po/vi.po b/po/vi.po
index e686c749..2efbeeb9 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-11-04 10:40-0500\n"
+"POT-Creation-Date: 2002-11-07 17:40-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"
@@ -28,88 +28,88 @@ msgstr "Lỗi khi tạo signal pipe."
 msgid "Duplicate (%s/%s)!"
 msgstr "Nhân đôi (%s/%s)!"
 
-#: src/vte.c:1295
+#: src/vte.c:1321
 #, 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:1802 src/vte.c:1811 src/vte.c:1823 src/vte.c:1841 src/vte.c:1846
-#: src/vte.c:1851
+#: src/vte.c:1828 src/vte.c:1837 src/vte.c:1849 src/vte.c:1867 src/vte.c:1872
+#: src/vte.c:1877
 #, 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:5147
+#: src/vte.c:5179
 #, c-format
 msgid "Got unexpected (key?) sequence `%s'."
 msgstr "Nhận sequence không mong muốn (key?) `%s'."
 
-#: src/vte.c:5967
+#: src/vte.c:5999
 #, c-format
 msgid "Character 0x%x is undefined, allocating one column."
 msgstr "Ký tự 0x%x không được định nghĩa, dùng một cột."
 
-#: src/vte.c:6173
+#: src/vte.c:6205
 #, 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:6780
+#: src/vte.c:6812
 #, c-format
 msgid "Error reading from child: %s."
 msgstr "Lỗi khi đọc từ child: %s."
 
-#: src/vte.c:6946
+#: src/vte.c:6978
 #, 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:9114
+#: src/vte.c:9102
 #, 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:9654
+#: src/vte.c:9642
 #, 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:9666
+#: src/vte.c:9654
 msgid "Failed to load default Xft font."
 msgstr "Không nạp được phông Xft mặc định."
 
-#: src/vte.c:9759
+#: src/vte.c:9747
 #, 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:9771
+#: src/vte.c:9759
 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:10034
+#: src/vte.c:10022
 #, 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:10070
+#: src/vte.c:10058
 #, c-format
 msgid "Error setting PTY size: %s."
 msgstr "Lỗi khi lập kích thước PTY: %s."
 
-#: src/vte.c:12799
+#: src/vte.c:12801
 msgid "Error allocating draw, disabling Xft."
 msgstr "Lỗi khi cấp phát draw, tắt Xft."
 
-#: src/vte.c:12807
+#: src/vte.c:12809
 msgid "Error allocating context, disabling Pango."
 msgstr "Lỗi khi cấp phát ngữ cảnh (context), tắt Pango."
 
-#: src/vte.c:12813
+#: src/vte.c:12815
 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:14321
+#: src/vte.c:14342
 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/dumpkeys.c b/src/dumpkeys.c
index d4815d59..edea8e9a 100644
--- a/src/dumpkeys.c
+++ b/src/dumpkeys.c
@@ -35,7 +35,7 @@
 #define MODE_HP_FUNCTION_KEYS		1052
 #define MODE_XTERM_FUNCTION_KEYS	1060
 #define MODE_VT220_FUNCTION_KEYS	1061
-#define MODE_ALTERNATE_SCREEN		1049
+#define MODE_ALTERNATE_SCREEN		1047
 
 enum {
 	normal = 0, application = 1
diff --git a/src/vte.c b/src/vte.c
index 58eedf84..db972fbb 100644
--- a/src/vte.c
+++ b/src/vte.c
@@ -8488,15 +8488,12 @@ vte_terminal_extend_selection(GtkWidget *widget, double x, double y,
 	terminal->pvt->selecting_had_delta = TRUE;
 	terminal->pvt->selecting_restart = FALSE;
 
-	/* Extend the selection by moving the "last" pointer to the event's
-	 * coordinates. */
+	/* If we're not in always-grow mode, update the last location of
+	 * the selection. */
 	last = &terminal->pvt->selection_last;
 	if (!always_grow) {
 		last->x = x + width / 2;
 		last->y = y + height * delta;
-	} else {
-		last->x = x;
-		last->y = y;
 	}
 
 	/* Map the origin and last selected points to a start and end. */
@@ -8517,8 +8514,8 @@ vte_terminal_extend_selection(GtkWidget *widget, double x, double y,
 	 * closer to the new point. */
 	if (always_grow) {
 		/* New endpoint is before existing selection. */
-		if ((y / height < start->y / height) ||
-		    ((y / height == start->y / height) &&
+		if ((y / height < ((start->y / height) - delta)) ||
+		    ((y / height == ((start->y / height) - delta)) &&
 		     (x / width < start->x / width))) {
 			start->x = x;
 			start->y = y + height * delta;
@@ -8857,7 +8854,8 @@ vte_terminal_button_press(GtkWidget *widget, GdkEventButton *event)
 					 * mode, extend selection if the cell
 					 * isn't already selected, otherwise
 					 * start selection. */
-					if (!vte_cell_is_selected(terminal,
+					if (terminal->pvt->has_selection &&
+					    !vte_cell_is_selected(terminal,
 								  cellx,
 								  celly,
 								  NULL)) {
diff --git a/src/vte.h b/src/vte.h
index 55f7ce25..361deb8d 100644
--- a/src/vte.h
+++ b/src/vte.h
@@ -168,7 +168,7 @@ void vte_terminal_set_scroll_on_keystroke(VteTerminal *terminal,
 
 /* Set the color scheme. */
 void vte_terminal_set_color_dim(VteTerminal *terminal,
-				 const GdkColor *bold);
+				const GdkColor *dim);
 void vte_terminal_set_color_bold(VteTerminal *terminal,
 				 const GdkColor *bold);
 void vte_terminal_set_color_foreground(VteTerminal *terminal,
diff --git a/vte.spec b/vte.spec
index 1290a12b..4a9a321c 100644
--- a/vte.spec
+++ b/vte.spec
@@ -1,5 +1,5 @@
 Name: vte
-Version: 0.10.2
+Version: 0.10.3
 Release: 1
 Summary: An experimental terminal emulator.
 License: LGPL
@@ -64,6 +64,9 @@ rm $RPM_BUILD_ROOT/%{_libdir}/lib%{name}.la
 %{_libdir}/pkgconfig/*
 
 %changelog
+* Thu Nov  7 2002 Nalin Dahyabhai <nalin@redhat.com> 0.10.3-1
+- get selection sorted out, really this time
+
 * Tue Nov  5 2002 Nalin Dahyabhai <nalin@redhat.com> 0.10.2-1
 - get selection sorted out