Merge branch 'master' of git.ganneff.de:emacs

* 'master' of git.ganneff.de:emacs:
  add puppet mode, align code and some local elisp files
  Add ibuffer
  Add highlight mode
  Add git-gutter mode, for it set fringe to 8
  new backup handling using backups-mode

diff --git a/.emacs.d/config/emacs.org b/.emacs.d/config/emacs.org
index 1b151ff..99f4736 100644 (file)
--- a/.emacs.d/config/emacs.org
+++ b/.emacs.d/config/emacs.org
@@ -921,7 +921,7 @@ Quickly move around in buffers.
 #+BEGIN_SRC emacs-lisp :tangle yes
 (use-package ace-jump-mode
   :ensure ace-jump-mode
-  :command ace-jump-mode
+  :commands ace-jump-mode
   :bind ("H-SPC" . ace-jump-mode))
 #+END_SRC
 ** ascii
@@ -3295,8 +3295,12 @@ Programming in ruby...
       :ensure ruby-hash-syntax)
 
     (defun my-ruby-mode-hook ()
-      (require 'inf-ruby)
-      (inf-ruby-keys)
+      (use-package inf-ruby
+        :ensure inf-ruby
+        :commands inf-ruby-minor-mode
+        :init
+        (progn
+          (add-hook 'ruby-mode-hook 'inf-ruby-minor-mode)
 
       (bind-key "<return>" 'my-ruby-smart-return ruby-mode-map)
       ;(bind-key "<tab>" 'indent-for-tab-command ruby-mode-map)
@@ -3304,7 +3308,7 @@ Programming in ruby...
        
       (set (make-local-variable 'yas-fallback-behavior)
            '(apply ruby-indent-command . nil))
-      (bind-key "<tab>" 'yas-expand-from-trigger-key ruby-mode-map))
+      (bind-key "<tab>" 'yas-expand-from-trigger-key ruby-mode-map))))
 
     (add-hook 'ruby-mode-hook 'my-ruby-mode-hook)