From eb6cd71ef42362112097d804b29d2da4e7035591 Mon Sep 17 00:00:00 2001
From: Przemyslaw Czerpak <druzus@priv.onet.pl>
Date: Mon, 22 Oct 2012 13:00:05 +0000
Subject: [PATCH] 2012-10-22 14:59 UTC+0200 Przemyslaw Czerpak
 (druzus/at/poczta.onet.pl)   * harbour/src/rtl/gttrm/gttrm.c     ! fixed
 support for national characters in terminals working in       ISO mode

  * harbour/contrib/xhb/xhbfunc.c
    * minor code simplification

  * harbour/doc/xhb-diff.txt
    * typo
---
 harbour/ChangeLog             | 11 +++++++++++
 harbour/contrib/xhb/xhbfunc.c |  2 +-
 harbour/doc/xhb-diff.txt      |  2 +-
 harbour/src/rtl/gttrm/gttrm.c | 10 +++++++---
 4 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index f0c7003b8c..449cbd6538 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -16,6 +16,17 @@
    The license applies to all entries newer than 2009-04-28.
 */
 
+2012-10-22 14:59 UTC+0200 Przemyslaw Czerpak (druzus/at/poczta.onet.pl)
+  * harbour/src/rtl/gttrm/gttrm.c
+    ! fixed support for national characters in terminals working in
+      ISO mode
+
+  * harbour/contrib/xhb/xhbfunc.c
+    * minor code simplification
+
+  * harbour/doc/xhb-diff.txt
+    * typo
+
 2012-10-22 01:51 UTC+0200 Viktor Szakats (harbour syenar.net)
   * contrib/hbct/ctmath.c
   * contrib/hbct/ctstr.c
diff --git a/harbour/contrib/xhb/xhbfunc.c b/harbour/contrib/xhb/xhbfunc.c
index b8084a269f..52ef78a3a2 100644
--- a/harbour/contrib/xhb/xhbfunc.c
+++ b/harbour/contrib/xhb/xhbfunc.c
@@ -288,7 +288,7 @@ HB_FUNC_EXTERN( NETNAME );
 
 HB_FUNC( XHB_NETNAME )
 {
-   if( HB_ISNUM( 1 ) && hb_parni( 1 ) == 1 )
+   if( hb_parni( 1 ) == 1 )
       HB_FUNC_EXEC( HB_USERNAME )
    else
       HB_FUNC_EXEC( NETNAME )
diff --git a/harbour/doc/xhb-diff.txt b/harbour/doc/xhb-diff.txt
index b4a16071c3..a2c2ecd96a 100644
--- a/harbour/doc/xhb-diff.txt
+++ b/harbour/doc/xhb-diff.txt
@@ -1486,7 +1486,7 @@ messages.
 
 In the future we plan to introduce real class objects like in Class(y) and
 some other languages (i.e. XBASE++) so it's important for portability to
-rite code which is Class(y) friendly and never use class function directly
+write code which is Class(y) friendly and never use class function directly
 as constructor, i.e. instead of writing code like:
       o := mycls( p1, p2, p3 )
 programmer should use:
diff --git a/harbour/src/rtl/gttrm/gttrm.c b/harbour/src/rtl/gttrm/gttrm.c
index d0cd40b420..6bd1befa58 100644
--- a/harbour/src/rtl/gttrm/gttrm.c
+++ b/harbour/src/rtl/gttrm/gttrm.c
@@ -1474,6 +1474,7 @@ again:
 
       if( pTerm->key_flag != 0 && nKey != 0 )
       {
+
          nKey |= pTerm->key_flag;
          pTerm->key_flag = 0;
       }
@@ -1481,9 +1482,12 @@ again:
 #ifdef HB_GT_UNICODE_BUF
       if( !pTerm->fUTF8 )
       {
-         int u = HB_GTSELF_KEYTRANS( pTerm->pGT, nKey );
-         if( u )
-            nKey = HB_INKEY_NEW_UNICODE( u );
+         if( nKey != 0 )
+         {
+            int u = HB_GTSELF_KEYTRANS( pTerm->pGT, nKey );
+            if( u )
+               return HB_INKEY_NEW_UNICODE( u );
+         }
       }
       else if( nKey >= 32 && nKey <= 255 )
       {