chiark
/
gitweb
/
~ian
/
ian-dotfiles.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
111c78c
)
emacs: magit
author
Ian Jackson
<ijackson@chiark.greenend.org.uk>
Sat, 11 Aug 2018 08:45:13 +0000
(09:45 +0100)
committer
Ian Jackson
<ijackson@chiark.greenend.org.uk>
Sat, 11 Aug 2018 08:45:13 +0000
(09:45 +0100)
home/emacs/ian.el
patch
|
blob
|
history
diff --git
a/home/emacs/ian.el
b/home/emacs/ian.el
index 28cf1e76cb32f2170281212b6a06588a1cd84cf6..e50a1f0598f5cb2c3f894dc0e98f276cc11c62d1 100644
(file)
--- a/
home/emacs/ian.el
+++ b/
home/emacs/ian.el
@@
-103,6
+103,8
@@
(global-set-key "
\18
\v
" 'quicker-compile)
(global-set-key "
\18
\18
" 'exchange-point-and-mark)
(global-set-key "
\18
\1a
" 'load-tramp)
(global-set-key "
\18
\v
" 'quicker-compile)
(global-set-key "
\18
\18
" 'exchange-point-and-mark)
(global-set-key "
\18
\1a
" 'load-tramp)
+ (global-set-key "
\18
g" 'magit-status)
+ (global-set-key "
\18
\e
g" 'magit-dispatch-popup)
(global-set-key "
\18
4
\16
" 'scroll-other-window)
(global-set-key "
\18
4m" 'vm-mail-other-window)
(global-set-key "
\18
9" 'vm-visit-folder)
(global-set-key "
\18
4
\16
" 'scroll-other-window)
(global-set-key "
\18
4m" 'vm-mail-other-window)
(global-set-key "
\18
9" 'vm-visit-folder)
@@
-549,6
+551,15
@@
The citation string is taken from cite-string."
(winner-mode t)
(winner-mode t)
+(global-magit-file-mode)
+
+(magit-wip-after-save-mode)
+(magit-wip-after-apply-mode)
+(magit-wip-before-change-mode)
+(setq magit-no-confirm
+ (append magit-no-confirm '(safe-with-wip)))
+
+(setq vc-handled-backends (delq 'Git vc-handled-backends))
;; (defun hack-dir-local-variables ()
;; "Read per-directory local variables for the current buffer.
;; (defun hack-dir-local-variables ()
;; "Read per-directory local variables for the current buffer.