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 2875ee7..4252cb7 100644 (file)
--- a/dot/e16-bindings
+++ b/dot/e16-bindings
@@ -4,6 +4,7 @@ MouseDouble   CA 1 wop * shade
 MouseDown     CA 2 wop * sz ptr
 MouseDouble   CA 2 wop * th available
 MouseDown     CA 3 menus show winops.menu
 MouseDown     CA 2 wop * sz ptr
 MouseDouble   CA 2 wop * th available
 MouseDown     CA 3 menus show winops.menu

+MouseDown     C5 3 menus show windowlist

 Aclass DESKBINDINGS normal
 Tooltip Clicking your mouse on the desktop will perform
 Tooltip the following actions
 Aclass DESKBINDINGS normal
 Tooltip Clicking your mouse on the desktop will perform
 Tooltip the following actions


@@ -30,26 +31,29 @@ Tooltip Go Forward a Desktop
 Aclass KEYBINDINGS global
 KeyDown    5       F6 exec gconftool --toggle /desktop/gnome/accessibility/keyboard/mousekeys_enable
 KeyDown    5       F7 exec un-backslashify-selection
 Aclass KEYBINDINGS global
 KeyDown    5       F6 exec gconftool --toggle /desktop/gnome/accessibility/keyboard/mousekeys_enable
 KeyDown    5       F7 exec un-backslashify-selection

-KeyDown    5       F8 exec xatom set XINIT_COMMAND :terminal
-KeyDown    5       F9 exec xatom set XINIT_COMMAND :ask-run
-KeyDown           5      F10 exec xatom set XINIT_COMMAND :ask-command
+KeyDown    5       F8 exec xinitcmd :terminal
+KeyDown    5       F9 exec xinitcmd :ask-run
+KeyDown           5      F10 exec xinitcmd :ask-command

 KeyDown           5      F11 exec lock-screen
 KeyDown    5      F12 exec xshutdown
 KeyDown    5      Tab focus next
 KeyDown    5     plus desk next
 KeyDown    5    minus desk prev
 KeyDown   C5        a desk arrange
 KeyDown           5      F11 exec lock-screen
 KeyDown    5      F12 exec xshutdown
 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        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        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
 KeyDown   C5       F1 menus show file.menu
 KeyDown   C5       F2 menus show enlightenment.menu
 KeyDown   C5       F3 menus show settings.menu


@@ -57,10 +61,21 @@ KeyDown   C5       F4 menus show windowlist
 KeyDown   C5       Up wop * raise
 KeyDown   C5     Down wop * lower
 KeyDown   C5      End exit restart
 KeyDown   C5       Up wop * raise
 KeyDown   C5     Down wop * lower
 KeyDown   C5      End exit restart

-KeyDown   S5        h wop * tw conservative
-KeyDown   S5        m wop * ts conservative 
-KeyDown   S5        v wop * th conservative
+KeyDown   SC5       h wop * tw conservative
+KeyDown   SC5       m wop * ts conservative
+KeyDown   SC5       v wop * th conservative

 KeyDown   S5       Up area move 0 -1
 KeyDown   S5     Down area move 0 1
 KeyDown   S5     Left area move -1 0
 KeyDown   S5    Right area move 1 0
 KeyDown   S5       Up area move 0 -1
 KeyDown   S5     Down area move 0 1
 KeyDown   S5     Left area move -1 0
 KeyDown   S5    Right area move 1 0

+KeyDown          5        Up wop * mr 0 -15
+KeyDown          5      Down wop * mr 0 +15
+KeyDown          5      Left wop * mr -15 0
+KeyDown          5     Right wop * mr +15 0
+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