TakeV/spacemacs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Fix magit-toggle-whitespace et al for magit 2.1.0

Browse source
This commit is contained in:
Jonas Bernoulli 2015-06-27 10:47:30 +02:00 committed by syl20bnr
parent 5df4ba0e75
commit 0677ece503
1 changed files with 15 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
contrib/!source-control/git/extensions.el
View file

@ -95,17 +95,27 @@
(defun magit-toggle-whitespace ()
(interactive)
(if (member "-w" magit-diff-options)
(if (member "-w" (if (derived-mode-p 'magit-diff-mode)
magit-refresh-args
magit-diff-section-arguments))
(magit-dont-ignore-whitespace)
(magit-ignore-whitespace)))
(defun magit-ignore-whitespace ()
(interactive)
(add-to-list 'magit-diff-options "-w")
(add-to-list (if (derived-mode-p 'magit-diff-mode)
'magit-refresh-args
'magit-diff-section-arguments)
"-w")
(magit-refresh))
(defun magit-dont-ignore-whitespace ()
(interactive)
(setq magit-diff-options (remove "-w" magit-diff-options))
(magit-refresh)))
(define-key magit-status-mode-map (kbd "W") 'magit-toggle-whitespace)))
(setq magit-diff-options
(remove "-w"
(if (derived-mode-p 'magit-diff-mode)
magit-refresh-args
magit-diff-section-arguments)))
(magit-refresh))
(define-key magit-status-mode-map (kbd "W") 'magit-toggle-whitespace))))