dot/emacs, el/dot-emacs.el: Configuration for greatly-enhanced Magit.

Oh, wow.  Magit is even more awesome, but needs a little tweaking.
Tweak, tweak.

diff --git a/dot/emacs b/dot/emacs
index 2ab16adfbcd17619a356d5aaec23874a914e8a05..d89f4427f7461a9fe852a8feec20c1b111addf1a 100644 (file)
--- a/dot/emacs
+++ b/dot/emacs
@@ -602,6 +602,9 @@
   (global-set-key [?\C-c ?t ?r] 'timeclock-reread-log)
   (global-set-key [?\C-c ?t ?w] 'timeclock-workday-remaining-string)
   (global-set-key [?\C-c ?t ?s] 'timeclock-status-string)
+  (global-set-key [?\C-c ?m ?m] 'magit-status)
+  (global-set-key [?\C-c ?m ?d] 'magit-dispatch-popup)
+  (global-set-key [?\C-c ?m ?w] 'magit-wip-log)
   (global-set-key [?\C-c ?k] 'compile)
   (global-set-key [?\C-x ?3] 'mdw-split-window-horizontally)
   (global-set-key [?\M-#] 'calc-dispatch)

diff --git a/el/dot-emacs.el b/el/dot-emacs.el
index 8f5b53c5d9c2336cbb91df44579bf872c78691fd..03946d60fa8086168088302f6d620bdf31cf1b18 100644 (file)
--- a/el/dot-emacs.el
+++ b/el/dot-emacs.el
@@ -1425,30 +1425,6 @@ (mdw-define-face dylan-header-background
   (((class color) (type x)) :background "NavyBlue")
   (t :background "blue"))
 
-(mdw-define-face magit-diff-add
-  (t :foreground "green"))
-(mdw-define-face magit-diff-del
-  (t :foreground "red"))
-(mdw-define-face magit-diff-file-header
-  (t :weight bold))
-(mdw-define-face magit-diff-hunk-header
-  (t :foreground "SkyBlue1"))
-(mdw-define-face magit-item-highlight
-  (((type tty)) :background "blue")
-  (t :background "grey11"))
-(mdw-define-face magit-log-head-label-remote
-  (((type tty)) :background "cyan" :foreground "green")
-  (t :background "grey11" :foreground "DarkSeaGreen2" :box t))
-(mdw-define-face magit-log-head-label-local
-  (((type tty)) :background "cyan" :foreground "yellow")
-  (t :background "grey11" :foreground "LightSkyBlue1" :box t))
-(mdw-define-face magit-log-head-label-tags
-  (((type tty)) :background "red" :foreground "yellow")
-  (t :background "LemonChiffon1" :foreground "goldenrod4" :box t))
-(mdw-define-face magit-log-graph
-  (((type tty)) :foreground "magenta")
-  (t :foreground "grey80"))
-
 (mdw-define-face erc-input-face
   (t :foreground "red"))
 
@@ -3649,6 +3625,18 @@ (defun git-grep (command-args)
                             git-grep-command 'git-grep-history)))
   (grep command-args))
 
+(setq magit-diff-refine-hunk 'all
+      magit-view-git-manual-method 'man
+      magit-wip-after-save-local-mode-lighter ""
+      magit-wip-after-apply-mode-lighter ""
+      magit-wip-before-change-mode-lighter "")
+(eval-after-load "magit"
+  '(progn (global-magit-file-mode 1)
+         (magit-wip-after-save-mode 1)
+         (magit-wip-after-apply-mode 1)
+         (magit-wip-before-change-mode 1)
+         (add-to-list 'magit-no-confirm 'safe-with-wip)))
+
 ;;;--------------------------------------------------------------------------
 ;;; Inferior Emacs Lisp.