summaryrefslogtreecommitdiff
path: root/init.el
diff options
context:
space:
mode:
Diffstat (limited to 'init.el')
-rw-r--r--init.el37
1 files changed, 1 insertions, 36 deletions
diff --git a/init.el b/init.el
index 9d3c9c3..633a148 100644
--- a/init.el
+++ b/init.el
@@ -134,42 +134,6 @@
(add-to-list 'auto-mode-alist '("\\.md\\'" . markdown-mode))
(add-to-list 'auto-mode-alist '("\\.js$" . js2-mode))
-;; full screen magit-status
-(require 'magit)
-(defadvice magit-status (around magit-fullscreen activate)
- (window-configuration-to-register :magit-fullscreen)
- ad-do-it
- (delete-other-windows))
-
-(defun my/magit-quit-session ()
- "Restores the previous window configuration and kills the magit buffer"
- (interactive)
- (kill-buffer)
- (jump-to-register :magit-fullscreen))
-
-(defun my/magit-toggle-whitespace ()
- "Toggles git option -w"
- (interactive)
- (if (member "-w" magit-diff-options)
- (my/magit-dont-ignore-whitespace)
- (my/magit-ignore-whitespace)))
-
-(defun my/magit-ignore-whitespace ()
- "Adds git option -w"
- (interactive)
- (add-to-list 'magit-diff-options "-w")
- (magit-refresh))
-
-(defun my/magit-dont-ignore-whitespace ()
- "Removes git option -w"
- (interactive)
- (setq magit-diff-options (remove "-w" magit-diff-options))
- (magit-refresh))
-
-(define-key magit-status-mode-map (kbd "q") 'my/magit-quit-session)
-(define-key magit-status-mode-map (kbd "W") 'my/magit-toggle-whitespace)
-
-
;; ido mode
(require 'ido)
(ido-mode 1)
@@ -292,6 +256,7 @@
(require 'rekado-mode)
(rekado-mode 1)
+(load "init-magit.el")
(load "init-eshell.el")
;; start in fullscreen mode