Merge branch 'cyrillic'

diff --cc Makefile
Simple merge

diff --cc src/curses/ux_input.c
index 552cffbe3a11fdadfbcd5deeff18a6d98b3c9e4a,7f65877eaeb780b2c2d0246d93a5811bfe6a9abe..680226acdbaf00f24581fb1728a2c088d82fc6da
--- 1/src/curses/ux_input.c
--- 2/src/curses/ux_input.c
+++ b/src/curses/ux_input.c
@@@ -665,11 -703,12 +703,11 @@@ zchar os_read_line (int bufmax, zchar *
            if (res) {
                scrnset(x, ' ', len);
  #ifdef USE_UTF8
-               utf8_mvaddstr(y, x, (char *) buf);
+               utf8_mvaddstr(y, x, buf);
  #else
 -              mvaddstr(y, x, (char *)buf);
 +              mvaddstr(y, x, (char *) buf);
  #endif
-               scrpos = len = strlen((char *) buf);
+               scrpos = len = zcharstrlen(buf);
            }
            continue;