From 9d167e87a49998aaf36cfc3e424ef4ec18a3a1de Mon Sep 17 00:00:00 2001
From: Viktor Szakats <harbour@syenar.net>
Date: Sun, 7 Oct 2012 20:58:29 +0000
Subject: [PATCH] 2012-10-07 22:56 UTC+0200 Viktor Szakats (harbour syenar.net)
   * src/common/hbverdsp.c     ! fix to previous commit

  * contrib/xhb/trpc.prg
    * formatting

  * src/rtl/achoice.prg
    * modified in-source bug example to use hb_keyPut()
---
 harbour/ChangeLog             | 10 ++++++++++
 harbour/contrib/xhb/trpc.prg  | 14 +++++++-------
 harbour/src/common/hbverdsp.c |  4 ++--
 harbour/src/rtl/achoice.prg   |  2 +-
 4 files changed, 20 insertions(+), 10 deletions(-)

diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index f4bef97a33..cd2d8229b4 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -16,6 +16,16 @@
    The license applies to all entries newer than 2009-04-28.
 */
 
+2012-10-07 22:56 UTC+0200 Viktor Szakats (harbour syenar.net)
+  * src/common/hbverdsp.c
+    ! fix to previous commit
+
+  * contrib/xhb/trpc.prg
+    * formatting
+
+  * src/rtl/achoice.prg
+    * modified in-source bug example to use hb_keyPut()
+
 2012-10-07 22:49 UTC+0200 Viktor Szakats (vszakats syenar.net)
   * contrib/hbhttpd/readme.txt
   * doc/dirstruc.txt
diff --git a/harbour/contrib/xhb/trpc.prg b/harbour/contrib/xhb/trpc.prg
index 4506fa03a3..47b3fd0d26 100644
--- a/harbour/contrib/xhb/trpc.prg
+++ b/harbour/contrib/xhb/trpc.prg
@@ -240,9 +240,9 @@ METHOD New( cFname, cSerial, nAuthLevel, oExec, oMeth ) CLASS tRPCFunction
       QUIT
    ENDIF
 
-   ::cName := aFuncDef[2]
-   cParam := aFuncDef[3]
-   ::cReturn := iif( Len( aFuncDef ) == 4, aFuncDef[4], aFuncDef[5] )
+   ::cName := aFuncDef[ 2 ]
+   cParam := aFuncDef[ 3 ]
+   ::cReturn := iif( Len( aFuncDef ) == 4, aFuncDef[ 4 ], aFuncDef[ 5 ] )
 
    // analyze parameter list
    IF Len( RTrim( cParam ) ) > 0
@@ -356,7 +356,7 @@ METHOD Describe() CLASS tRPCFunction
 
    IF Len( ::aParameters ) > 0
       FOR nCount := 1 TO Len( ::aParameters ) - 1
-         cRet += ::aParameters[nCount] + ","
+         cRet += ::aParameters[ nCount ] + ","
       NEXT
       cRet += ::aParameters[ -1 ]
    ENDIF
@@ -559,7 +559,7 @@ METHOD RUN() CLASS tRPCServeCon
          IF nSafeStatus == RPCS_STATUS_LOGGED
             aData := ::RecvFunction( .F. , .F. )
             IF aData != NIL
-               lBreak := ! ::FuncCall( aData[2] )
+               lBreak := ! ::FuncCall( aData[ 2 ] )
             ELSE
                lBreak := .T.
             ENDIF
@@ -575,7 +575,7 @@ METHOD RUN() CLASS tRPCServeCon
          IF nSafeStatus == RPCS_STATUS_LOGGED
             aData := ::RecvFunction( .T. , .F. )
             IF aData != NIL
-               lBreak := ! ::FuncCall( aData[2] )
+               lBreak := ! ::FuncCall( aData[ 2 ] )
             ELSE
                lBreak := .T.
             ENDIF
@@ -754,7 +754,7 @@ METHOD LaunchChallenge( cUserid, cPassword ) CLASS tRPCServeCon
    /* Let's generate the sequence */
    cChallenge := Space( 255 )
    FOR nCount := 1 TO 255
-      cChallenge[ nCount ] := Chr( HB_Random(0,255 ) )
+      cChallenge[ nCount ] := Chr( HB_Random(0, 255 ) )
    NEXT
 
    ::nChallengeCRC := HB_Checksum( cChallenge )
diff --git a/harbour/src/common/hbverdsp.c b/harbour/src/common/hbverdsp.c
index 5e2747baf4..201a84784f 100644
--- a/harbour/src/common/hbverdsp.c
+++ b/harbour/src/common/hbverdsp.c
@@ -92,11 +92,11 @@ void hb_verBuildInfo( void )
    }
 
    hb_conOutErr( "ChangeLog last entry: ", 0 );
-   hb_conOutErr( hb_verSvnLastEntry(), 0 );
+   hb_conOutErr( hb_verChangeLogLastEntry(), 0 );
    hb_conOutErr( hb_conNewLine(), 0 );
 
    hb_conOutErr( "ChangeLog ID: ", 0 );
-   hb_conOutErr( hb_verSvnChangeLogID(), 0 );
+   hb_conOutErr( hb_verChangeLogID(), 0 );
    hb_conOutErr( hb_conNewLine(), 0 );
 
    {
diff --git a/harbour/src/rtl/achoice.prg b/harbour/src/rtl/achoice.prg
index 08099e2046..51778dcc15 100644
--- a/harbour/src/rtl/achoice.prg
+++ b/harbour/src/rtl/achoice.prg
@@ -15,7 +15,7 @@
    ---
    #include "inkey.ch"
    CLS
-   KEYBOARD Chr( K_DOWN ) + Chr( K_UP ) // bogus '2' appears out of the area here.
+   hb_keyPut( { K_DOWN, K_UP } ) // bogus '2' appears out of the area here.
    AChoice( 0, 0, 0, 0, { "1", "2" } )
    ---
  */