From f7aa07fba3de810d2b46a980c05faba05b3debf3 Mon Sep 17 00:00:00 2001
From: Viktor Szakats <harbour@syenar.net>
Date: Thu, 21 Mar 2013 19:02:24 +0100
Subject: [PATCH] 2013-03-21 19:00 UTC+0100 Viktor Szakats (harbour syenar.net)
   * utils/hbmk2/hbmk2.prg     + when running a script with hbrun/hbmk2 form
 cmdline,       show an error if it's not found instead of launching       the
 interactive menu.

  * doc/en/tbrowse.txt
    ! minor, for testing commits
---
 ChangeLog.txt         | 12 ++++++++++++
 doc/en/tbrowse.txt    |  2 +-
 utils/hbmk2/hbmk2.prg | 13 ++++++++-----
 3 files changed, 21 insertions(+), 6 deletions(-)

diff --git a/ChangeLog.txt b/ChangeLog.txt
index 000f5cb68c..06bcfb4321 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -10,6 +10,18 @@
      * Change, ! Fix, % Optimization, + Addition, - Removal, ; Comment
  */
 
+2013-03-21 19:00 UTC+0100 Viktor Szakats (harbour syenar.net)
+  * utils/hbmk2/hbmk2.prg
+    + when running a script with hbrun/hbmk2 form cmdline,
+      show an error if it's not found instead of launching
+      the interactive menu.
+
+  * doc/en/tbrowse.txt
+    ! minor, for testing commits
+
+2013-03-21 18:56 UTC+0100 Viktor Szakats (harbour syenar.net)
+  * doc/en/tbrowse.txt
+
 2013-03-21 13:08 UTC+0100 Viktor Szakats (harbour syenar.net)
   * contrib/hbmisc/hbedit.prg
   * contrib/xhb/stream.prg
diff --git a/doc/en/tbrowse.txt b/doc/en/tbrowse.txt
index ba15f1459e..ab96f1a132 100644
--- a/doc/en/tbrowse.txt
+++ b/doc/en/tbrowse.txt
@@ -292,7 +292,7 @@
    $ONELINER$
       Add an New Column to an TBrowse Object
    $SYNTAX$
-      AddColumn(oCol) --> Self
+      AddColumn( <oCol> ) --> Self
    $ARGUMENTS$
       <oCol>  Is an TbColumn object
    $RETURNS$
diff --git a/utils/hbmk2/hbmk2.prg b/utils/hbmk2/hbmk2.prg
index f2cf143591..af938eaf94 100644
--- a/utils/hbmk2/hbmk2.prg
+++ b/utils/hbmk2/hbmk2.prg
@@ -13725,6 +13725,7 @@ STATIC PROCEDURE __hbshell( cFile, ... )
    LOCAL hHRB
    LOCAL cVersion
    LOCAL cParamL
+   LOCAL cFileOri
 
    /* get this before doing anything else */
    LOCAL lDebug := ;
@@ -13841,9 +13842,12 @@ STATIC PROCEDURE __hbshell( cFile, ... )
       cFile := hb_DirSepToOS( cFile )
    ENDIF
 
-   IF !( cFile == "." ) .AND. ;
-      ! Empty( hb_FNameName( cFile ) ) .AND. ;
-      ! Empty( cFile := FindInPath( cFile,, { ".hb", ".hrb" } ) )
+   IF cFile == "." .OR. Empty( hb_FNameName( cFile ) )
+
+      __hbshell_ext_init( aExtension )
+      __hbshell_prompt( hb_AParams() )
+
+   ELSEIF ! Empty( cFile := FindInPath( cFileOri := cFile,, { ".hb", ".hrb" } ) )
 
       cExt := Lower( hb_FNameExt( cFile ) )
 
@@ -13925,8 +13929,7 @@ STATIC PROCEDURE __hbshell( cFile, ... )
          EXIT
       ENDSWITCH
    ELSE
-      __hbshell_ext_init( aExtension )
-      __hbshell_prompt( hb_AParams() )
+      OutErr( hb_StrFormat( I_( "hbshell: Cannot find script '%1$s'" ), cFileOri ) + _OUT_EOL )
    ENDIF
 
    RETURN