From 97b38b702d9b66021b5dc587185338d52d93bbda Mon Sep 17 00:00:00 2001
From: Viktor Szakats <harbour@syenar.net>
Date: Wed, 11 Jan 2012 23:15:38 +0000
Subject: [PATCH] 2012-01-12 00:12 UTC+0100 Viktor Szakats (harbour syenar.net)
   * src/rtl/memvarhb.prg     % '&varname := value' -> __mvPut( varname, value
 )     * formatting

  * contrib/hbrun/hbrun.prg
    ! formatting
---
 harbour/ChangeLog               | 8 ++++++++
 harbour/contrib/hbrun/hbrun.prg | 2 +-
 harbour/src/rtl/memvarhb.prg    | 8 ++++----
 3 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 8b99278030..93d1f81550 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -16,6 +16,14 @@
    The license applies to all entries newer than 2009-04-28.
 */
 
+2012-01-12 00:12 UTC+0100 Viktor Szakats (harbour syenar.net)
+  * src/rtl/memvarhb.prg
+    % '&varname := value' -> __mvPut( varname, value )
+    * formatting
+
+  * contrib/hbrun/hbrun.prg
+    ! formatting
+
 2012-01-11 23:56 UTC+0100 Viktor Szakats (harbour syenar.net)
   * src/rdd/dbtotal.prg
   * contrib/hbqt/qtcore/hbqt_misc.prg
diff --git a/harbour/contrib/hbrun/hbrun.prg b/harbour/contrib/hbrun/hbrun.prg
index c1de2dafa3..9156aaba06 100644
--- a/harbour/contrib/hbrun/hbrun.prg
+++ b/harbour/contrib/hbrun/hbrun.prg
@@ -202,7 +202,7 @@ STATIC FUNCTION hbrun_extensionlist()
    STATIC s_aList
 
    IF s_aList == NIL
-      s_aList := iif( Type( "__HBRUN_EXTENSIONS()" ) == "UI", &("__hbrun_extensions()"), {} )
+      s_aList := iif( Type( "__HBRUN_EXTENSIONS()" ) == "UI", &( "__hbrun_extensions()" ), {} )
       ASort( s_aList )
    ENDIF
 
diff --git a/harbour/src/rtl/memvarhb.prg b/harbour/src/rtl/memvarhb.prg
index 838ee254f6..d6d9cdecf1 100644
--- a/harbour/src/rtl/memvarhb.prg
+++ b/harbour/src/rtl/memvarhb.prg
@@ -6,7 +6,7 @@
  * Harbour Project source code:
  * MEMVAR save/restore functions with >10 long variable name support.
  *
- * Copyright 2010 Viktor Szakats (harbour syenar.net)
+ * Copyright 2010 Viktor Szakats (harbour syenar.hu)
  * www - http://harbour-project.org
  *
  * This program is free software; you can redistribute it and/or modify
@@ -190,7 +190,7 @@ FUNCTION HB_MVRESTORE( cFileName, lAdditive, cMask, lIncludeMask )
       ENDIF
 
       IF ! lAdditive
-         __MVClear()
+         __mvClear()
       ENDIF
 
       IF Set( _SET_DEFEXTENSIONS )
@@ -263,11 +263,11 @@ FUNCTION HB_MVRESTORE( cFileName, lAdditive, cMask, lIncludeMask )
                      IF xValue == NIL
                         xValue := item[ 2 ]
                      ENDIF
-                     &cName := item[ 2 ]
+                     __mvPut( cName, item[ 2 ] )
                   ENDIF
                ENDIF
             NEXT
-            __MVSETBASE()
+            __mvSetBase()
          ENDIF
       ELSE
          FClose( fhnd )