From 60bb7f2a002a73148a7d58775f5afd7bd2efe89a Mon Sep 17 00:00:00 2001
From: Semen Panevin <spanevin@users.sourceforge.net>
Date: Mon, 30 Nov 2015 05:52:20 +0000
Subject: [PATCH] Fixed a couple of errors and typos, patch from Serguei E.
 Leontiev

---
 contrib/Unix/README-utf8.txt    |  7 ++-
 contrib/Unix/ged-vttest-lite.py | 76 ++++++++++++++++-----------------
 2 files changed, 43 insertions(+), 40 deletions(-)

diff --git a/contrib/Unix/README-utf8.txt b/contrib/Unix/README-utf8.txt
index 902a1b2..d5b9123 100644
--- a/contrib/Unix/README-utf8.txt
+++ b/contrib/Unix/README-utf8.txt
@@ -1,4 +1,5 @@
 # vim:set sw=4 ts=8 tw=72 fileencoding=utf8::Кодировка:UTF-8[АБЁЪЯабёъя] 
+# You can use `iconv -f utf-8 README-utf8.txt'
 
 Описание файлов каталога golded+/contrib/Unix
 
@@ -14,11 +15,11 @@
 
     1.2 putty-xterm и putty-xterm-256color описание терминала PuTTY при
 	настройке "The Functions keys and keypad = Xterm R6" (этого
-	описания в terminfo не было).
+	описания в terminfo [1.554 2015/10/24] не было).
 
     1.3 sco-putty описание терминала PuTTY при настройке "The Functions
 	keys and keypad = SCO" и "The Backspace key = Control-H". При
-	этой настройке программам доступны не только Shift+Fn, но
+	этой настройке программам доступны не только Shift+Fn, но и 
 	Ctrl+Fn клавиши. Конфликт между Shift+F2 и Shift+Tab разрешён в
 	пользу последнего, т.е. Shift+F2 интерпретируется как KEY_BTAB
 	(Back tab key).
@@ -40,6 +41,8 @@
 
 	в зависимости от настройки PuTTY.
 
+	Значение переменной окружения TERM можно настроить в настройках
+	PuTTY Connection->Data->"Terminal-type string".
 
 2. XTerm-KOI8-U-strict.terminal - файл описания Терминала для OS X 10.9,
     10.10 и 10.11 с максимально полным соответствием XTerm R7.  (Получен
diff --git a/contrib/Unix/ged-vttest-lite.py b/contrib/Unix/ged-vttest-lite.py
index 00e6f94..ed1f2b6 100755
--- a/contrib/Unix/ged-vttest-lite.py
+++ b/contrib/Unix/ged-vttest-lite.py
@@ -1,5 +1,5 @@
 #!/usr/bin/env python 
-# vim:set sw=4 ts=8 fileencoding=utf8::Кодировка:UTF-8[АБЁЪЯабёъя] 
+# vim:set sw=4 ts=8 et fileencoding=utf8::Кодировка:UTF-8[АБЁЪЯабёъя] 
 #
 #   Авторское право (с) 2015, Сергей Леонтьев, leo@sai.msu.ru
 #
@@ -52,37 +52,37 @@ def test(y, x, ukey, ckeys, lckey=1):
     mysc.addstr(y+m,m,"Press character 'n' twice with pause to next test") 
     n = 0
     while n < 2:
-	key = mysc.getkey()
-	for i in range(lckey):
-	    mysc.timeout(300)
-	    try:
-		key += mysc.getkey()
-	    except:
-		pass
-	    mysc.timeout(-1)
-	found = False
-	for k in ckeys:
-	    if k == key:
-		found = True
-	if found:
-	    mysc.addstr(y,x+of,"                       ")
-	    mysc.addstr(y,x+of,"Ok: " + key)
-	    break
-	elif "n" == key:
-	    n += 1
-	else:
-	    mysc.timeout(300)
-	    keys = "'" + key
-	    try:
-		while 1:
-		    key = mysc.getkey()
-		    keys += key
-	    except:
-		pass
-	    keys += "'"
-	    mysc.timeout(-1)
-	    mysc.addstr(y,x+of,"                       ")
-	    mysc.addstr(y,x+of,"Fail: " + keys)
+        key = mysc.getkey()
+        for i in range(lckey):
+            mysc.timeout(300)
+            try:
+                key += mysc.getkey()
+            except:
+                pass
+            mysc.timeout(-1)
+        found = False
+        for k in ckeys:
+            if k == key:
+                found = True
+        if found:
+            mysc.addstr(y,x+of,"                       ")
+            mysc.addstr(y,x+of,"Ok: " + key)
+            break
+        elif "n" == key:
+            n += 1
+        else:
+            mysc.timeout(300)
+            keys = "'" + key
+            try:
+                while 1:
+                    key = mysc.getkey()
+                    keys += key
+            except:
+                pass
+            keys += "'"
+            mysc.timeout(-1)
+            mysc.addstr(y,x+of,"                       ")
+            mysc.addstr(y,x+of,"Fail: " + keys)
     mysc.addstr(y+m,m,"                                                 ") 
 
 #========================================================== 
@@ -91,18 +91,18 @@ def test(y, x, ukey, ckeys, lckey=1):
 try: 
     mysc = initscr() 
     noecho()
-    term = termname()
+    term = termname().decode("ascii")
     shift = 12
     shift2 = 12
     for t in [ "xterm-old", "xterm-r5", "xterm-r6", "screen.xterm-r6", 
-		"rxvt", "screen.rxvt", "putty", "screen.putty", "linux",
-		"screen.linux" ]:
-	if t == term[0:len(t)]:
-	    shift = 10
+                "rxvt", "screen.rxvt", "putty", "screen.putty", "linux",
+                "screen.linux" ]:
+        if t == term[0:len(t)]:
+            shift = 10
     mysc.keypad(1)
     mysc.clear() 
     mysc.border(0)
-    mysc.addstr(1,8,termname() + " " + str(mysc.getmaxyx()))
+    mysc.addstr(1,8,term + " " + str(mysc.getmaxyx()))
     test(3,3,"F3",["KEY_F(3)"])
     test(3,40,"Shift+F3",["KEY_F(" + str(3+shift) + ")"])
     test(4,3,"F5",["KEY_F(5)"])