about summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorJames Booth <boothj5@gmail.com>2015-01-16 23:35:31 +0000
committerJames Booth <boothj5@gmail.com>2015-01-16 23:35:31 +0000
commit18f05c59ee76a7df6de8eb0a2d933b97645b0e4d (patch)
treec936e0a28d286f0f980c7327d84caa574ae8c58e
parent8805fd5c3894e0bd4b9353a7078ed15a73431dac (diff)
downloadprofani-tty-18f05c59ee76a7df6de8eb0a2d933b97645b0e4d.tar.gz
Fixed merge
-rw-r--r--src/ui/inputwin.c2
1 files changed, 1 insertions, 1 deletions
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)) {
5f2dec0ea27a9ce4856e303425e12f866cea2'>9b55f2de ^
a4cadf78 ^
c7325de0 ^
fb347855 ^
c7325de0 ^
383e601f ^
81190251 ^
a2726b6a ^

c7325de0 ^
a2726b6a ^
c7325de0 ^
383e601f ^
c7325de0 ^
383e601f ^
c7325de0 ^
c7325de0 ^

a2726b6a ^

c7325de0 ^
a2726b6a ^
c7325de0 ^
383e601f ^
c7325de0 ^
383e601f ^
c7325de0 ^
c7325de0 ^

a2726b6a ^

c7325de0 ^
a2726b6a ^
c7325de0 ^
383e601f ^
c7325de0 ^
383e601f ^
c7325de0 ^
c7325de0 ^

a2726b6a ^

c7325de0 ^
a2726b6a ^
c7325de0 ^
383e601f ^
c7325de0 ^
383e601f ^
c7325de0 ^
c7325de0 ^
79e9ab83 ^
a2726b6a ^

79e9ab83 ^
a2726b6a ^
79e9ab83 ^


383e601f ^
79e9ab83 ^
a2726b6a ^
79e9ab83 ^


e5ac12af ^
79e9ab83 ^

a2726b6a ^

79e9ab83 ^
a2726b6a ^
79e9ab83 ^


383e601f ^
79e9ab83 ^
a2726b6a ^
79e9ab83 ^


e5ac12af ^
79e9ab83 ^

a2726b6a ^

79e9ab83 ^
a2726b6a ^
79e9ab83 ^


383e601f ^
79e9ab83 ^
a2726b6a ^
79e9ab83 ^


e5ac12af ^
79e9ab83 ^

a2726b6a ^

79e9ab83 ^
a2726b6a ^
79e9ab83 ^


383e601f ^
79e9ab83 ^
a2726b6a ^
79e9ab83 ^


e5ac12af ^
79e9ab83 ^

a2726b6a ^

79e9ab83 ^
a2726b6a ^
79e9ab83 ^


383e601f ^
79e9ab83 ^
a2726b6a ^
79e9ab83 ^


e5ac12af ^
79e9ab83 ^

a2726b6a ^

79e9ab83 ^
a2726b6a ^
79e9ab83 ^


383e601f ^
79e9ab83 ^
a2726b6a ^
79e9ab83 ^


e5ac12af ^
79e9ab83 ^

a2726b6a ^

79e9ab83 ^
a2726b6a ^
79e9ab83 ^
2af418fd ^
79e9ab83 ^
383e601f ^
79e9ab83 ^
a2726b6a ^
79e9ab83 ^
2af418fd ^
79e9ab83 ^
e5ac12af ^
79e9ab83 ^

a2726b6a ^

79e9ab83 ^
a2726b6a ^
79e9ab83 ^
2af418fd ^
79e9ab83 ^
383e601f ^
79e9ab83 ^
a2726b6a ^
2af418fd ^


e5ac12af ^
2af418fd ^

a2726b6a ^

2af418fd ^
a2726b6a ^
2af418fd ^


383e601f ^
2af418fd ^
a2726b6a ^
2af418fd ^

79e9ab83 ^
e5ac12af ^
79e9ab83 ^
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204