Minor.

svn path=/trunk/; revision=2342

4 files changed, 12 insertions, 4 deletions

diff --git a/ChangeLog b/ChangeLog
index f2c3009c..60640622 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2008-12-12  Behdad Esfahbod  <behdad@gnome.org>
 
+	* src/vteunistr.h:
+
+2008-12-12  Behdad Esfahbod  <behdad@gnome.org>
+
 	* src/iso2022.c (_vte_iso2022_ambiguous_width): Avoid pointers in the
 	const array.
 
diff --git a/src/vte.c b/src/vte.c
index b5436d37..4ddead14 100644
--- a/src/vte.c
+++ b/src/vte.c
@@ -5273,8 +5273,7 @@ vte_same_class(VteTerminal *terminal, glong acol, glong arow,
 		if (pcell == NULL || pcell->c == 0) {
 			return FALSE;
 		}
-		if (word_char != vte_terminal_is_word_char(terminal,
-							   _vte_unistr_get_base (pcell->c))) {
+		if (word_char != vte_terminal_is_word_char(terminal, _vte_unistr_get_base (pcell->c))) {
 			return FALSE;
 		}
 		return TRUE;
@@ -10068,6 +10067,9 @@ vte_terminal_draw_cells_with_attributes(VteTerminal *terminal,
 	char scratch_buf[VTE_UTF8_BPC];
 	int fore, back;
 
+	/* Note: since this function is only called with the pre-edit text,
+	 * all the items contain gunichar only, not vteunistr. */
+
 	for (i = 0, cell_count = 0; i < n; i++) {
 		cell_count += g_unichar_to_utf8(items[i].c, scratch_buf);
 	}
diff --git a/src/vteunistr.c b/src/vteunistr.c
index d00bd3a1..534d15b2 100644
--- a/src/vteunistr.c
+++ b/src/vteunistr.c
@@ -95,6 +95,7 @@ _vte_unistr_append_unichar (vteunistr s, gunichar c)
 	return ret;
 }
 
+/* Unused
 int
 _vte_unistr_strlen (vteunistr s)
 {
@@ -108,6 +109,7 @@ _vte_unistr_strlen (vteunistr s)
 	}
 	return len;
 }
+*/
 
 gunichar
 _vte_unistr_get_base (vteunistr s)
diff --git a/src/vteunistr.h b/src/vteunistr.h
index faba4d67..730e3239 100644
--- a/src/vteunistr.h
+++ b/src/vteunistr.h
@@ -28,13 +28,13 @@ G_BEGIN_DECLS
 
 typedef guint32 vteunistr;
 
-#define vte_unistr_from_unichar(c) ((vteunistr) c)
-
 vteunistr
 _vte_unistr_append_unichar (vteunistr s, gunichar c);
 
+/* Unused
 int
 _vte_unistr_strlen (vteunistr s);
+*/
 
 gunichar
 _vte_unistr_get_base (vteunistr s);