Eskil

Diff
Login

Differences From Artifact [7395f3c535]:

To Artifact [264a5473ed]:


116
117
118
119
120
121
122
123

124
125





126
127
128
129
130
131
132
116
117
118
119
120
121
122

123
124

125
126
127
128
129
130
131
132
133
134
135
136







-
+

-
+
+
+
+
+







    MakeRegistryFrame $top.c "Diff Conflict" $keyc $new

    set new "$valbase \"%1\""
    MakeRegistryFrame $top.dd "Directory Diff" $keydd $new
    pack $top.d $top.c $top.dd -side "top" -fill x -padx 4 -pady 4

    locateEditor ::util(editor)
    if {[string match "*runemacs.exe" $::util(editor)]} {
    if {[string match "*runemacs.exe" [lindex $::util(editor) 0]]} {
        # Set up emacs
        set newkey "\"[file nativename $::util(editor)]\" \"%1\""
        set newkey "\"[file nativename [lindex $::util(editor) 0]]\""
        foreach eArg [lrange $::util(editor) 1 end] {
            append newkey " \"$eArg\""
        }
        append newkey " \"%1\""
        MakeRegistryFrame $top.e "Emacs" $keye $newkey
        pack $top.e -side "top" -fill x -padx 4 -pady 4
    }

    ttk::button $top.close -text "Close" -width 10 \
            -command [list destroy $top] -default active
    pack $top.close -side bottom -pady 4