From 18f05c59ee76a7df6de8eb0a2d933b97645b0e4d Mon Sep 17 00:00:00 2001
From: James Booth <boothj5@gmail.com>
Date: Fri, 16 Jan 2015 23:35:31 +0000
Subject: [PATCH] Fixed merge

---
 src/ui/inputwin.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/ui/inputwin.c b/src/ui/inputwin.c
index cec6ef7d..f567b0a8 100644
--- a/src/ui/inputwin.c
+++ b/src/ui/inputwin.c
@@ -264,7 +264,7 @@ static int
 _get_display_length(void)
 {
     int len = 0;
-    gchar *curr = g_utf8_offset_to_pointer(line, 0);
+    gchar *curr = g_utf8_offset_to_pointer(input, 0);
     while (*curr != '\0') {
         gunichar curru = g_utf8_get_char(curr);
         if (g_unichar_iswide(curru)) {