dot/gitconfig.in: Get `git merge' to include ancestor text in conflicts.

[profile] / dot / e16-bindings

diff --git a/dot/e16-bindings b/dot/e16-bindings
index cd3a003..4252cb7 100644 (file)
--- a/dot/e16-bindings
+++ b/dot/e16-bindings
@@ -40,17 +40,20 @@ KeyDown    5      Tab focus next
 KeyDown    5     plus desk next
 KeyDown    5    minus desk prev
 KeyDown   C5        a desk arrange
+KeyDown   C5        c exec xsetroot -cursor_name left_ptr
 KeyDown   C5        f wop * fullscreen
 KeyDown   C5        g magwin show
 KeyDown   C5        h wop * tw available
 KeyDown   C5        i wop * iconify
 KeyDown   C5        k wop * kill
+KeyDown          C5        l exec xrepaint -a
 KeyDown   C5        m wop * ts available
 KeyDown   C5        r wop * shade
 KeyDown   C5        s wop * stick
 KeyDown   C5        v wop * th available
 KeyDown   C5        w menus show winops.menu
 KeyDown   C5        x wop * close
+KeyDown   C5        z wop * zoom
 KeyDown   C5       F1 menus show file.menu
 KeyDown   C5       F2 menus show enlightenment.menu
 KeyDown   C5       F3 menus show settings.menu
@@ -73,3 +76,6 @@ KeyDown         SC5      Up wop * sr 0 -15
 KeyDown          SC5    Down wop * sr 0 +15
 KeyDown          SC5    Left wop * sr -15 0
 KeyDown          SC5   Right wop * sr +15 0
+KeyDown          5      Home wop * opacity 100
+KeyDown          5      Next wop * opacity -5
+KeyDown          5     Prior wop * opacity +5