Eskil

Check-in [2d12b9c342]
Login

Many hyperlinks are disabled.
Use anonymous login to enable hyperlinks.

Overview
Comment:Corrected detected of Emacs for Registry.
Downloads: Tarball | ZIP archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA3-256: 2d12b9c342ff270650bfc77211f627d06e7d219a8227e45d34a671c214955acb
User & Date: peter 2018-01-11 16:24:16.174
Context
2018-01-11
16:28
Bumped revision to 2.8.1 check-in: 3e91ca34e5 user: peter tags: trunk
16:24
Corrected detected of Emacs for Registry. check-in: 2d12b9c342 user: peter tags: trunk
2017-12-28
16:56
Pause before a large file in dirdiff processing to make it clear where it is slowed down. check-in: 0bf5b9f746 user: peter tags: trunk
Changes
Unified Diff Ignore Whitespace Patch
Changes to Changes. 



1
2
3
4
5
6
7




2017-12-28
 Pause before a large file in dirdiff processing to make it clear where it is
 slowed down.

2017-12-22
 Added -excludedir and -excludefile options for dir diff.


>
>
>








1
2
3
4
5
6
7
8
9
10

2018-01-11
 Corrected detected of Emacs for Registry. (Broken in 2.7.4)

2017-12-28
 Pause before a large file in dirdiff processing to make it clear where it is
 slowed down.

2017-12-22
 Added -excludedir and -excludefile options for dir diff.
︙︙
Changes to src/dirdiff.tcl.
︙︙
271
272
273
274
275
276
277

278
279
280
281
282
283
284


    return [Fsort $files2]
}

# Bring up an editor to display a file.
proc EditFile {file} {
    locateEditor ::util(editor)

    exec {*}$::util(editor) $file &
}

# Pick a directory for compare
proc BrowseDir {dirVar entryW} {
    upvar "#0" $dirVar dir









>








271
272
273
274
275
276
277
278
279
280
281
282
283
284
285


    return [Fsort $files2]
}

# Bring up an editor to display a file.
proc EditFile {file} {
    locateEditor ::util(editor)
    # util(editor) may contain options, and is treated as a pre-command
    exec {*}$::util(editor) $file &
}

# Pick a directory for compare
proc BrowseDir {dirVar entryW} {
    upvar "#0" $dirVar dir
︙︙
Changes to src/registry.tcl.
︙︙
116
117
118
119
120
121
122
123
124
125




126
127
128
129
130
131
132

    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)]} {
        # Set up emacs
        set newkey "\"[file nativename $::util(editor)]\" \"%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








|

|
>
>
>
>








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" [lindex $::util(editor) 0]]} {
        # Set up emacs
        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
︙︙