X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=setup%2Fwindmove.el;h=41b1fbad156931096cd3223851349cc9abdf9ad5;hb=a59ee7bb87b084f57a6fbdc835f49a7390ee5fdb;hp=e463ba092261efb46b79d9b308e44d94b58a0730;hpb=5909fea6b8ad5b95d9af7cad6824f11d944bdfd6;p=emacs-init.git

diff --git a/setup/windmove.el b/setup/windmove.el
index e463ba0..41b1fba 100644
--- a/setup/windmove.el
+++ b/setup/windmove.el
@@ -1,5 +1,15 @@
 (require 'windmove)
-(global-set-key (kbd "S-<left>") 'windmove-left)
-(global-set-key (kbd "S-<right>") 'windmove-right)
-(global-set-key (kbd "S-<up>") 'windmove-up)
-(global-set-key (kbd "S-<down>") 'windmove-down)
+(require 'framemove)
+
+(if window-system
+    (progn
+      (global-set-key (kbd "S-<left>") 'windmove-left)
+      (global-set-key (kbd "S-<right>") 'windmove-right)
+      (global-set-key (kbd "S-<up>") 'windmove-up)
+      (global-set-key (kbd "S-<down>") 'windmove-down))
+  (global-set-key (kbd "C-c <left>") 'windmove-left)
+  (global-set-key (kbd "C-c <right>") 'windmove-right)
+  (global-set-key (kbd "C-c <up>") 'windmove-up)
+  (global-set-key (kbd "C-c <down>") 'windmove-down))
+
+ (setq framemove-hook-into-windmove t)