also don't join '--' in line wrapping.

git-svn-id: svn://sylpheed.sraoss.jp/sylpheed/trunk@1882 ee746299-78ed-0310-b773-934348b2243d

3 files changed, 14 insertions, 0 deletions

diff --git a/ChangeLog b/ChangeLog
index 16487667..32443fbd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2007-08-23
 
+	* src/compose.c: compose_is_itemized(): also don't join '--'.
+
+2007-08-23
+
 	* libsylph/codeconv.c: conv_get_current_locale(): fixed the case
 	  when cur_locale = "" (thanks to Elohin Igor').
 
diff --git a/ChangeLog.ja b/ChangeLog.ja
index 7c2e5a8e..7f7db0d0 100644
--- a/ChangeLog.ja
+++ b/ChangeLog.ja
@@ -1,5 +1,9 @@
 2007-08-23
 
+	* src/compose.c: compose_is_itemized(): '--' も結合しないようにした。
+
+2007-08-23
+
 	* libsylph/codeconv.c: conv_get_current_locale(): cur_locale = ""
 	  の場合を修正(Elohin Igor' さん thanks)。
 
diff --git a/src/compose.c b/src/compose.c
index 5f9730c5..b8e4b853 100644
--- a/src/compose.c
+++ b/src/compose.c
@@ -2393,6 +2393,12 @@ static gboolean compose_is_itemized(GtkTextBuffer *buffer,
 	wc = gtk_text_iter_get_char(&iter);
 	if (g_unichar_isspace(wc))
 		return TRUE;
+	else if (ch[0] == '-') {
+		/* -- */
+		clen = g_unichar_to_utf8(wc, ch);
+		if (clen == 1 && ch[0] == '-')
+			return TRUE;
+	}
 
 	return FALSE;
 }