From: Stefan Bund Date: Tue, 13 May 2014 17:17:59 +0000 (+0200) Subject: update X-Git-Url: http://g0dil.de/git?a=commitdiff_plain;h=c57b0f8a078e3d662b252e07901388cf46d66c6a;p=emacs-init.git update --- diff --git a/.gitmodules b/.gitmodules index bdd6371..5536bd8 100644 --- a/.gitmodules +++ b/.gitmodules @@ -12,3 +12,6 @@ url = git://g0dil.de/emacsstuff.git [submodule "git-modes"] path = git-modes url = https://github.com/magit/git-modes.git +[submodule "git-wip"] + path = git-wip + url = https://github.com/bartman/git-wip.git diff --git a/emacsstuff b/emacsstuff index dc419c8..3d37060 160000 --- a/emacsstuff +++ b/emacsstuff @@ -1 +1 @@ -Subproject commit dc419c8ec52c5339da6637117a5b0bb89cdd766f +Subproject commit 3d370602ea891fbc150d425a9e1eb4d4c3b38763 diff --git a/git-wip b/git-wip new file mode 160000 index 0000000..a1ee45d --- /dev/null +++ b/git-wip @@ -0,0 +1 @@ +Subproject commit a1ee45d3593c4c9f216e8498d7b6b6abc5c0a857 diff --git a/setup/git-wip.el b/setup/git-wip.el new file mode 100644 index 0000000..27e49eb --- /dev/null +++ b/setup/git-wip.el @@ -0,0 +1,10 @@ +(let ((dir (concat (file-name-directory + (directory-file-name + (file-name-directory + (or load-file-name + (when (boundp 'bytecomp-filename) bytecomp-filename) + buffer-file-name)))) + "git-wip/"))) + (load (concat dir "emacs/git-wip-mode.el")) + (add-to-list 'exec-path dir) + (setenv "PATH" (concat (getenv "PATH") ":/usr/lib/git-core"))) diff --git a/setup/magit.el b/setup/magit.el index d477536..506fe7b 100644 --- a/setup/magit.el +++ b/setup/magit.el @@ -80,7 +80,7 @@ (split-string files "\n"))))))) (defun grep-in-git-repo (regexp &optional words-only) - (interactive "sGrep files in Git repo regexp: \np") + (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"))