From: Mark Wooding <mdw@distorted.org.uk>
Date: Tue, 6 May 2008 14:37:31 +0000 (+0100)
Subject: emacs: Apply the windmove bindings regardless of windmove presence.
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~mdw/git/profile/commitdiff_plain/f110f932bcafb4c24076a52502ac8b146d507f9f?ds=inline;hp=-c

emacs: Apply the windmove bindings regardless of windmove presence.

It seems silly protecting the bindings, which can't fail anyway.
---

f110f932bcafb4c24076a52502ac8b146d507f9f
diff --git a/emacs b/emacs
index f3429bd..8df0d9c 100644
--- a/emacs
+++ b/emacs
@@ -318,17 +318,17 @@
 ;; --- Global keymap changes ---
 
 (trap
-  (windmove-default-keybindings)
-  (global-set-key [?\C-x ?w left] 'windmove-left)
-  (global-set-key [?\C-x ?w ?h] 'windmove-left)
-  (global-set-key [?\C-x ?w up] 'windmove-up)
-  (global-set-key [?\C-x ?w ?k] 'windmove-up)
-  (global-set-key [?\C-x ?w down] 'windmove-down)
-  (global-set-key [?\C-x ?w ?j] 'windmove-down)
-  (global-set-key [?\C-x ?w right] 'windmove-right)
-  (global-set-key [?\C-x ?w ?l] 'windmove-right)
-  (setq windmove-wrap-around t))
+  (windmove-default-keybindings))
+(setq windmove-wrap-around t)
 (trap (iswitchb-mode))
+(global-set-key [?\C-x ?w left] 'windmove-left)
+(global-set-key [?\C-x ?w ?h] 'windmove-left)
+(global-set-key [?\C-x ?w up] 'windmove-up)
+(global-set-key [?\C-x ?w ?k] 'windmove-up)
+(global-set-key [?\C-x ?w down] 'windmove-down)
+(global-set-key [?\C-x ?w ?j] 'windmove-down)
+(global-set-key [?\C-x ?w right] 'windmove-right)
+(global-set-key [?\C-x ?w ?l] 'windmove-right)
 (global-set-key [?\M-#] 'calc-dispatch)
 (global-set-key [?\C-x ?/] 'auto-fill-mode)
 (global-set-key [?\C-x ?w ?d] 'mdw-divvy-window)