X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=setup%2Fbindings.el;h=25cab3faeb852e83d67b758a162b9405878af8e7;hb=08b18d75005cc26993ad27a663cd06b8b14be5f7;hp=660ff0cbeb7476ca77f09e116dfef03f0a9035c8;hpb=5d0b8238ad6fb712c8e744eb150b1ad793e412f9;p=emacs-init.git

diff --git a/setup/bindings.el b/setup/bindings.el
index 660ff0c..25cab3f 100644
--- a/setup/bindings.el
+++ b/setup/bindings.el
@@ -9,17 +9,32 @@
 (global-set-key "\C-c'c" 'toggle-case-fold-search)
 (global-set-key "\C-c's" 'flyspell-mode)
 (global-set-key "\C-c'a" 'global-auto-revert-mode)
+(global-set-key "\C-cF" 'ffap)
 
-(require 'develock)
-(require 'develock-py)
+;(require 'develock)
+;(require 'develock-py)
 
-(defun toggle-whitespace-modes ()
+(defun toggle-whitespace-mode (&optional mode)
   (interactive)
-  (if whitespace-mode
-      (progn
-        (whitespace-mode 0)
-        (develock-mode 0))
-    (whitespace-mode 1)
-    (develock-mode 1)))
+  ;; toggle whitespace mode between:
+  ;; * everything as globaly configured
+  ;; * as above but disable lines-tail
+  ;; * nothing
+  (if (null mode)
+      (if (local-variable-p 'whitespace-style)
+          (if (null whitespace-style)
+              (setq mode 'default)
+            (setq mode 'none))
+        (setq mode 'longlines)))
+  (cond ((eq mode 'default)
+         (kill-local-variable 'whitespace-style))
+        ((eq mode 'longlines)
+         (setq-local whitespace-style (remove 'lines-tail (default-value 'whitespace-style))))
+        ((eq mode 'none)
+         (setq-local whitespace-style nil)))
+  (whitespace-mode -1)
+  (sit-for 0)
+  (whitespace-mode 1)
+  (message "whitespace: %s" mode))
 
-(global-set-key "\C-c' " 'toggle-whitespace-modes)
+(global-set-key "\C-c' " 'toggle-whitespace-mode)