diff --git a/PluginDefinition.cpp b/PluginDefinition.cpp index 1c42e25..84e9bed 100644 --- a/PluginDefinition.cpp +++ b/PluginDefinition.cpp @@ -157,7 +157,7 @@ void commandMenuInit() setCommand( 12, TEXT( "-SEPARATOR-" ), NULL, NULL, false ); setCommand( 13, TEXT( "&Pull" ), pullFile, NULL, false ); setCommand( 14, TEXT( "&Status" ), statusAll, NULL, false ); - setCommand( 15, TEXT( "&Branch/Checkout" ), branchFile, NULL, false ); + setCommand( 15, TEXT( "Bra&nch/Checkout" ), branchFile, NULL, false ); setCommand( 16, TEXT( "&Commit" ), commitAll, NULL, false ); setCommand( 17, TEXT( "Pus&h" ), pushFile, NULL, false ); setCommand( 18, TEXT( "-SEPARATOR-" ), NULL, NULL, false ); @@ -551,7 +551,13 @@ void blameFileFiles( std::vector files = {} ) files.push_back( getCurrentFile() ); if ( g_useTortoise ) - ExecTortoiseCommand( TEXT( "blame" ), files, false, true ); + { + int pos = (int)::SendMessage( getCurScintilla(), SCI_GETCURRENTPOS, 0, 0 ); + int line = (int)::SendMessage( getCurScintilla(), SCI_LINEFROMPOSITION, pos, 0 ); + std::wstring blame = TEXT( "blame /line:" ); + blame += std::to_wstring( line + 1 ); + ExecTortoiseCommand( blame, files, false, true ); + } else ExecGitCommand( TEXT( "\" blame" ), files, false, true ); } diff --git a/resource.h b/resource.h index 60480bb..c5b0b52 100644 --- a/resource.h +++ b/resource.h @@ -8,7 +8,7 @@ #define VER_MAJOR 1 #define VER_MINOR 4 #define VER_RELEASE 4 -#define VER_BUILD 1 +#define VER_BUILD 2 #define VER_STRING STR(VER_MAJOR) "." STR(VER_MINOR) "." STR(VER_RELEASE) "." STR(VER_BUILD) #define FILE_DESCRIPTION "Notepad++ Plugin for Git SCM."