Sync with maint

diff --git a/git-gui/git-gui.sh b/git-gui/git-gui.sh
index 89f636f4963cf7933639f6a23b3be2e8fd4c0964..153f85da068294917f5e60afca4fb6715f3f32ab 100755 (executable)
--- a/git-gui/git-gui.sh
+++ b/git-gui/git-gui.sh
@@ -135,6 +135,20 @@ proc strcat {args} {
 ::msgcat::mcload $oguimsg
 unset oguimsg
 
+######################################################################
+##
+## On Mac, bring the current Wish process window to front
+
+if {[tk windowingsystem] eq "aqua"} {
+       catch {
+               exec osascript -e [format {
+                       tell application "System Events"
+                               set frontmost of processes whose unix id is %d to true
+                       end tell
+               } [pid]]
+       }
+}
+
 ######################################################################
 ##
 ## read only globals
@@ -3003,18 +3017,11 @@ blame {
        set jump_spec {}
        set is_path 0
        foreach a $argv {
-               if {[file exists $a]} {
-                       if {$path ne {}} usage
-                       set path [normalize_relpath $a]
-                       break
-               } elseif {[file exists $_prefix$a]} {
-                       if {$path ne {}} usage
-                       set path [normalize_relpath $_prefix$a]
-                       break
-               }
+               set p [file join $_prefix $a]
 
-               if {$is_path} {
+               if {$is_path || [file exists $p]} {
                        if {$path ne {}} usage
+                       set path [normalize_relpath $p]
                        break
                } elseif {$a eq {--}} {
                        if {$path ne {}} {