Merge remote-tracking branch 'origin/master'

* origin/master:
  init: Speed up the untangling
  init: Unbind C-z if not running on a terminal
  init: Fix noweb-ref name

2 files changed, 17 insertions, 6 deletions

diff --git a/init.d/main.org b/init.d/main.org
index 1bde2ab..fb471ab 100644
--- a/init.d/main.org
+++ b/init.d/main.org
@@ -421,6 +421,17 @@ that points to a file under version control.
   (setq vc-follow-symlinks t)
 #+end_src
 
+*** Unbind C-z, if not running in terminal
+
+C-z is a relict from terminal programms to suspend the currently
+running programm. It is not needed under X11 and the gui will freeze,
+if you press it by accident.
+
+#+begin_src emacs-lisp
+(when window-system
+ (global-unset-key (kbd "C-z")))
+#+end_src
+
 ** Visual
 *** Window configuration
 
@@ -1503,7 +1514,7 @@ create more hydras.
            ("<f2>" . alex/hydra-zoom/body)
            ("C-t" . alex/hydra-toggle/body))
     :config
-    <<helm>>)
+    <<hydra>>)
 #+end_src
 
 *** move splitter
@@ -1511,7 +1522,7 @@ create more hydras.
 With this hydra I can move the splitter between frames using the
 cursor keys.
 
-#+begin_src emacs-lisp :noweb-ref helm :tangle no
+#+begin_src emacs-lisp :noweb-ref hydra :tangle no
   (require 'hydra-examples)
   (defhydra alex/hydra-splitter ()
     "Move window spitter"
@@ -1526,7 +1537,7 @@ cursor keys.
 With this hydra I can change font site on demand, by repeatedly
 pressing + or - until the desired font-size is reached.
 
-#+begin_src emacs-lisp :noweb-ref helm :tangle no
+#+begin_src emacs-lisp :noweb-ref hydra :tangle no
   (defhydra alex/hydra-zoom ()
     "Change font size"
     ("+" text-scale-increase "zoom in")
@@ -1542,7 +1553,7 @@ Because the keys are already documented in the docstring, hydra should
 not show all the keys again in the mode line and we globally set the
 hint to nil.
 
-#+begin_src emacs-lisp :noweb-ref helm :tangle no
+#+begin_src emacs-lisp :noweb-ref hydra :tangle no
   (defhydra alex/hydra-toggle (:hint nil)
     "
 
diff --git a/init.el b/init.el
index b841c11..902642d 100644
--- a/init.el
+++ b/init.el
@@ -1,5 +1,5 @@
 (let ((file-name-handler-alist nil))
   (package-initialize nil)
-  (setq package-enable-at-startup nil)
-
+  (setq package-enable-at-startup nil
+        org-babel-use-quick-and-dirty-noweb-expansion t)
   (org-babel-load-file "~/.emacs.d/init.d/main.org"))