magit config updates

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

diff --git a/setup/magit.el b/setup/magit.el
index de8011d..2ecddc5 100644 (file)
--- a/setup/magit.el
+++ b/setup/magit.el
@@ -119,17 +119,41 @@
     (let ((default-directory dir))
       (grep (format "git ls-files -z | xargs -r0 grep -nwHF %s | cat -" symbol)))))
 
+(defun git-files-find-class-decl (symbol)
+  (interactive (list (read-string "Symbol: " (current-word))))
+  (let ((dir (magit-get-top-dir default-directory)))
+    (if (not dir) (error "No git repository"))
+    (let ((default-directory dir))
+      (grep (format "git ls-files -z | xargs -r0 grep -nwHF %s | grep -Ew '(class|struct)' | cat -"
+                    symbol)))))
+
 (global-set-key "\C-cGF" 'git-files-find-symbol)
+(global-set-key "\C-cGC" 'git-files-find-class-decl)
+
 (defun dired-git-files ()
   (interactive)
-  (let ((default-directory (magit-get-top-dir default-directory))
+  (let ((default-directory (magit-get-top-dir default-directory))\
         (ls-lisp-use-insert-directory-program t)
         files)
-    (setq files (shell-command-to-string "git ls-files"))
-    (dired (cons default-directory (split-string files "\n")))))
+    (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"))
@@ -140,4 +164,5 @@
   (interactive "P")
   (quit-window kill-buffer))
 
-(setq magit-diff-options '("-w"))
+; ignore whitespace
+; (setq magit-diff-options '("-w"))