Fossil

Check-in [f6d95831]
Login

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

Overview
Comment:Disable navigation key binds in the --tk diff screen. Otherwise, pressing "q" in the Search entry box causes the whole diff window to die.
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA1: f6d9583173cbd6d2b170fac338721c6b10ed9456
User & Date: drh 2016-08-01 13:50:34
Context
2016-08-01
17:09
Update the built-in SQLite to the 3.14 first beta. check-in: f475b943 user: drh tags: trunk
13:50
Disable navigation key binds in the --tk diff screen. Otherwise, pressing "q" in the Search entry box causes the whole diff window to die. check-in: f6d95831 user: drh tags: trunk
12:45
Fix a C99-style comment. check-in: 9e2f940e user: drh tags: trunk
Changes
Hide Diffs Unified Diffs Ignore Whitespace Patch

Changes to src/diff.tcl.

225
226
227
228
229
230
231





232


233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
  }
  enableSync y
}

wm withdraw .
wm title . $CFG(TITLE)
wm iconname . $CFG(TITLE)





bind . <q> exit


bind . <Escape><Escape> exit
bind . <Destroy> {after 0 exit}
bind . <Tab> {cycleDiffs; break}
bind . <<PrevWindow>> {cycleDiffs 1; break}
bind . <Control-f> {searchOnOff; break}
bind . <n> {catch searchNext; break}
bind . <Control-g> {catch searchNext; break}
bind . <p> {catch searchPrev; break}
bind . <Return> {
  event generate bb.files <1>
  event generate .bb.files <ButtonRelease-1>
  break
}
foreach {key axis args} {
  Up    y {scroll -5 units}







>
>
>
>
>
|
>
>
|




<

<







225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244

245

246
247
248
249
250
251
252
  }
  enableSync y
}

wm withdraw .
wm title . $CFG(TITLE)
wm iconname . $CFG(TITLE)
# Keystroke bindings for on the top-level window for navigation and
# control also fire when those same keystrokes are pressed in the
# Search entry box.  Disable them, to prevent the diff screen from
# disappearing abruptly and unexpectedly when searching for "q".
#
# bind . <q> exit
# bind . <p> {catch searchPrev; break}
# bind . <n> {catch searchNext; break}
# bind . <Escape><Escape> exit
bind . <Destroy> {after 0 exit}
bind . <Tab> {cycleDiffs; break}
bind . <<PrevWindow>> {cycleDiffs 1; break}
bind . <Control-f> {searchOnOff; break}

bind . <Control-g> {catch searchNext; break}

bind . <Return> {
  event generate bb.files <1>
  event generate .bb.files <ButtonRelease-1>
  break
}
foreach {key axis args} {
  Up    y {scroll -5 units}