Fossil SCM
Disable navigation key binds in the --tk diff screen. Otherwise, pressing "q" in the Search entry box causes the whole diff window to die.
Commit
f6d9583173cbd6d2b170fac338721c6b10ed9456
Parent
9e2f940ec588a89…
1 file changed
+9
-4
+9
-4
| --- src/diff.tcl | ||
| +++ src/diff.tcl | ||
| @@ -227,19 +227,24 @@ | ||
| 227 | 227 | } |
| 228 | 228 | |
| 229 | 229 | wm withdraw . |
| 230 | 230 | wm title . $CFG(TITLE) |
| 231 | 231 | wm iconname . $CFG(TITLE) |
| 232 | -bind . <q> exit | |
| 233 | -bind . <Escape><Escape> exit | |
| 232 | +# Keystroke bindings for on the top-level window for navigation and | |
| 233 | +# control also fire when those same keystrokes are pressed in the | |
| 234 | +# Search entry box. Disable them, to prevent the diff screen from | |
| 235 | +# disappearing abruptly and unexpectedly when searching for "q". | |
| 236 | +# | |
| 237 | +# bind . <q> exit | |
| 238 | +# bind . <p> {catch searchPrev; break} | |
| 239 | +# bind . <n> {catch searchNext; break} | |
| 240 | +# bind . <Escape><Escape> exit | |
| 234 | 241 | bind . <Destroy> {after 0 exit} |
| 235 | 242 | bind . <Tab> {cycleDiffs; break} |
| 236 | 243 | bind . <<PrevWindow>> {cycleDiffs 1; break} |
| 237 | 244 | bind . <Control-f> {searchOnOff; break} |
| 238 | -bind . <n> {catch searchNext; break} | |
| 239 | 245 | bind . <Control-g> {catch searchNext; break} |
| 240 | -bind . <p> {catch searchPrev; break} | |
| 241 | 246 | bind . <Return> { |
| 242 | 247 | event generate bb.files <1> |
| 243 | 248 | event generate .bb.files <ButtonRelease-1> |
| 244 | 249 | break |
| 245 | 250 | } |
| 246 | 251 |
| --- src/diff.tcl | |
| +++ src/diff.tcl | |
| @@ -227,19 +227,24 @@ | |
| 227 | } |
| 228 | |
| 229 | wm withdraw . |
| 230 | wm title . $CFG(TITLE) |
| 231 | wm iconname . $CFG(TITLE) |
| 232 | bind . <q> exit |
| 233 | bind . <Escape><Escape> exit |
| 234 | bind . <Destroy> {after 0 exit} |
| 235 | bind . <Tab> {cycleDiffs; break} |
| 236 | bind . <<PrevWindow>> {cycleDiffs 1; break} |
| 237 | bind . <Control-f> {searchOnOff; break} |
| 238 | bind . <n> {catch searchNext; break} |
| 239 | bind . <Control-g> {catch searchNext; break} |
| 240 | bind . <p> {catch searchPrev; break} |
| 241 | bind . <Return> { |
| 242 | event generate bb.files <1> |
| 243 | event generate .bb.files <ButtonRelease-1> |
| 244 | break |
| 245 | } |
| 246 |
| --- src/diff.tcl | |
| +++ src/diff.tcl | |
| @@ -227,19 +227,24 @@ | |
| 227 | } |
| 228 | |
| 229 | wm withdraw . |
| 230 | wm title . $CFG(TITLE) |
| 231 | wm iconname . $CFG(TITLE) |
| 232 | # Keystroke bindings for on the top-level window for navigation and |
| 233 | # control also fire when those same keystrokes are pressed in the |
| 234 | # Search entry box. Disable them, to prevent the diff screen from |
| 235 | # disappearing abruptly and unexpectedly when searching for "q". |
| 236 | # |
| 237 | # bind . <q> exit |
| 238 | # bind . <p> {catch searchPrev; break} |
| 239 | # bind . <n> {catch searchNext; break} |
| 240 | # bind . <Escape><Escape> exit |
| 241 | bind . <Destroy> {after 0 exit} |
| 242 | bind . <Tab> {cycleDiffs; break} |
| 243 | bind . <<PrevWindow>> {cycleDiffs 1; break} |
| 244 | bind . <Control-f> {searchOnOff; break} |
| 245 | bind . <Control-g> {catch searchNext; break} |
| 246 | bind . <Return> { |
| 247 | event generate bb.files <1> |
| 248 | event generate .bb.files <ButtonRelease-1> |
| 249 | break |
| 250 | } |
| 251 |