Make config work with new Magit

2 files changed, 10 insertions, 13 deletions

diff --git a/lisp/init-appearance.el b/lisp/init-appearance.el
index 4cbf926..e946be6 100644
--- a/lisp/init-appearance.el
+++ b/lisp/init-appearance.el
@@ -51,7 +51,6 @@
 ;; unclutter modeline
 (require-package 'diminish)
 (require 'diminish)
-(eval-after-load "magit" '(diminish 'magit-auto-revert-mode))
 (eval-after-load "whitespace" '(diminish 'whitespace-mode))
 (eval-after-load "whole-line-or-region" '(diminish 'whole-line-or-region-mode))
 (eval-after-load "projectile" '(diminish 'projectile-mode))
diff --git a/lisp/init-git.el b/lisp/init-git.el
index 5a92545..66bcfaa 100644
--- a/lisp/init-git.el
+++ b/lisp/init-git.el
@@ -1,12 +1,11 @@
 ;; install packages
 (require-packages
- '(magit git-commit-mode git-rebase-mode gitconfig-mode gitignore-mode))
+ '(magit gitconfig-mode gitignore-mode))
 
 (require 'magit)
-(require 'git-commit-mode)
-(require 'git-rebase-mode)
 (require 'gitconfig-mode)
 (require 'gitignore-mode)
+(require 'grep)
 (require 'vc-git)
 
 ;; use appropiate git-mode for .gitconfig and .gitignore extensions
@@ -19,28 +18,27 @@
 ;; magit blame keybinding
 (global-set-key (kbd "C-c b") 'magit-blame-mode)
 
-;; hide magit instructions
-(setq magit-last-seen-setup-instructions "1.4.0")
-
-(defun magit-visit-item-noselect (&optional other-window)
+(defun magit-diff-visit-file-noselect (file &optional other-window)
   "Visit current item, but don't select it."
-  (interactive "P")
+  (interactive (list (or (magit-file-at-point)
+                         (user-error "No file at point"))
+                     current-prefix-arg))
   (let ((current-window (selected-window)))
-    (magit-visit-item other-window)
+    (magit-diff-visit-file file other-window)
     (select-window current-window)))
 
 (add-hook 'magit-status-mode-hook
           (lambda ()
             ;; make C-o and o behave as in dired
             (define-key magit-status-mode-map (kbd "C-o")
-              'magit-visit-item-noselect)
+              'magit-diff-visit-file-noselect)
             (define-key magit-status-mode-map (kbd "o")
-              'magit-visit-item)))
+              'magit-diff-visit-file)))
 
 (defun git-grep-root ()
   "Run git-grep in the repository root."
   (interactive)
-  (let ((git-root-path (magit-get-top-dir)))
+  (let ((git-root-path (magit-toplevel)))
     (when git-root-path
       (vc-git-grep (grep-read-regexp) "*" git-root-path))))