org mode, more window stuff

[emacs-init.git] / setup / magit.el

diff --git a/setup/magit.el b/setup/magit.el
index c4405bb..db2f66e 100644 (file)
--- a/setup/magit.el
+++ b/setup/magit.el
@@ -1,7 +1,41 @@
-(add-to-list 'load-path "~/.emacs.d/magit")
-(require 'magit)
+(add-to-list 'load-path (concat (file-name-directory
+                                 (directory-file-name
+                                  (file-name-directory
+                                   (or load-file-name
+                                       (when (boundp 'bytecomp-filename) bytecomp-filename)
+                                       buffer-file-name))))
+                                "magit"))
+
+(add-to-list 'load-path (concat (file-name-directory
+                                 (directory-file-name
+                                  (file-name-directory
+                                   (or load-file-name
+                                       (when (boundp 'bytecomp-filename) bytecomp-filename)
+                                       buffer-file-name))))
+                                "git-modes"))
+
+(add-to-list 'load-path (concat (file-name-directory
+                                 (directory-file-name
+                                  (file-name-directory
+                                   (or load-file-name
+                                       (when (boundp 'bytecomp-filename) bytecomp-filename)
+                                       buffer-file-name))))
+                                "auto-install"))
+
 (require 'cl)
 
+(if (not (functionp 'run-hook-wrapped))
+    (defun run-hook-wrapped (hook wrap-function &rest args)
+      (loop for fn in hook
+            thereis (apply 'wrap-function fn args))))
+
+(if (not (functionp 'process-live-p))
+    (defun process-live-p (process)
+      (memq (process-status process)
+            '(run open listen connect stop))))
+
+(require 'magit)
+
 (when (eq system-type 'windows-nt)
 
   (require 'advice)
@@ -28,25 +62,46 @@
 
 ); End Windows-NT
 
+(defadvice magit-mode-quit-window (around my-magit-mode-quit-window activate)
+  (letf (((symbol-function 'selected-window) (lambda ())))
+    ad-do-it))
+
 (global-set-key "\C-cGS" 'magit-status)
 
+(defun my-shell-command-to-string (cmd)
+  (shell-command cmd " *my-shell-command-to-string*")
+  (save-current-buffer
+    (set-buffer " *my-shell-command-to-string*")
+    (prog1
+        (buffer-string)
+      (kill-buffer " *my-shell-command-to-string*"))))
+
+(defun git-repo-files ()
+  (let ((default-directory (magit-get-top-dir default-directory)))
+    (split-string (my-shell-command-to-string "git ls-files") "\n")))
+
 (defun find-file-in-git-repo ()
   (interactive)
-  (let* ((repo (magit-get-top-dir default-directory))
-         (files (shell-command-to-string (format "cd %s && git ls-files" repo))))
+  (let ((repo (magit-get-top-dir default-directory))
+        (files (git-repo-files)))
     (find-file
      (concat repo
              (ido-completing-read
               "Find file in git repo: "
               (remove-if (lambda (x) (string= "" x))
-              (split-string files "\n")))))))
+              files))))))
 
-(defun grep-in-git-repo (regexp)
-  (interactive "sGrep files in Git repo regexp: ")
+(defun grep-in-git-repo (regexp &optional words-only)
+  (interactive "sGrep files in Git repo regexp: \nP")
   (let ((default-directory (magit-get-top-dir default-directory)))
     (if (not default-directory)
         (error "not a Git directory"))
-    (grep (format "git ls-files -z | xargs -r0 grep -nH -E %s | cat -" (shell-quote-argument regexp)))))
+    (grep (format "git ls-files -z | xargs -r0 grep -nH -E%s -- %s | cat -"
+                  (if words-only " -w" "") (shell-quote-argument regexp)))))
+
+(setenv "GIT_PAGER" "cat")
+(setenv "GIT_MAN_VIEWER" "woman")
+(setenv "GIT_EDITOR" "emacsclient")
 
 (defun find-file-maybe-git (&optional nogit)
   (interactive "P")
@@ -57,13 +112,47 @@
 (global-set-key "\C-x\C-f" 'find-file-maybe-git)
 (global-set-key "\C-cGG" 'grep-in-git-repo)
 
-(defun git-files-find-symbol (&optional arg)
-  (interactive "P")
-  (let ((symbol (current-word))
-        (dir (magit-get-top-dir default-directory)))
+(defun git-files-find-symbol (symbol)
+  (interactive (list (read-string "Symbol: " (current-word))))
+  (let ((dir (magit-get-top-dir default-directory)))
     (if (not dir) (error "No git repository"))
-    (if arg (setq symbol (read-string "Symbol: " nil nil symbol)))
     (let ((default-directory dir))
       (grep (format "git ls-files -z | xargs -r0 grep -nwHF %s | cat -" symbol)))))
 
 (global-set-key "\C-cGF" 'git-files-find-symbol)
+
+(defun dired-git-files ()
+  (interactive)
+  (let ((default-directory (magit-get-top-dir default-directory))\
+        (ls-lisp-use-insert-directory-program t)
+        files)
+    (setq files (delete-if '(lambda (file) (string= file ""))
+                           (split-string (shell-command-to-string "git ls-files") "\n")))
+    (dired (cons default-directory files))))
+
+(global-set-key "\C-cGD" 'dired-git-files)
+
+(defun dired-grep-git-files (regexp &optional words-only)
+  (interactive "sRegexp: \nP")
+  (let ((default-directory (magit-get-top-dir default-directory))
+        (cmd (format "git ls-files -z | xargs -r0 grep -l -E%s -- %s | cat -"
+                     (if words-only " -w" "") (shell-quote-argument regexp))))
+    (if (not default-directory)
+        (error "not in Git repository"))
+    (setq files (delete-if '(lambda (file) (string= file ""))
+                           (split-string (shell-command-to-string cmd)  "\n")))
+    (dired (cons default-directory files))))
+
+(global-set-key "\C-cGH" 'dired-grep-git-files)
+
+(defun magit-svn-fetch ()
+  (interactive)
+  (magit-run-git-async "svn" "fetch"))
+
+(define-key magit-mode-map "Nf" 'magit-svn-fetch)
+
+(defun magit-quit-window (&optional kill-buffer)
+  (interactive "P")
+  (quit-window kill-buffer))
+
+(setq magit-diff-options '("-w"))