Mercurial > dotfiles
changeset 161:668268f29a88
Merge
| author | Augie Fackler <durin42@gmail.com> |
|---|---|
| date | Tue, 24 Nov 2009 15:20:07 -0600 |
| parents | dafd5586742e (diff) eb7cb3d25060 (current diff) |
| children | 7576736ca6fa |
| files | .elisp/settings/50.preferences.el .elisp/textmate.el |
| diffstat | 6 files changed, 32 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/.elisp/settings/50.localfuncs.el +++ b/.elisp/settings/50.localfuncs.el @@ -1,3 +1,17 @@ +(defun af-generic-diff-repo () + (interactive) + (let ((root (textmate-project-root))) + (cd root) + (hg-view-output + ((format "project diff for %s" root)) + (call-process (textmate-project-root-type root) nil t nil "diff") + (diff-mode) + (setq diff (not (= (point-min) (point-max)))) + (font-lock-fontify-buffer) + (cd root)))) +(global-set-key [(control c)(t)(=)] 'af-generic-diff-repo) +(global-set-key [(control c)(d)] 'af-generic-diff-repo) + (defun pyflakes-this-buffer () (interactive) (compilation-start (concat "cd "
--- a/.elisp/settings/50.preferences.el +++ b/.elisp/settings/50.preferences.el @@ -54,4 +54,11 @@ (setq uniquify-ignore-buffers-re "^\\*") (setq hg-outgoing-repository "") (setq hg-incoming-repository "") -(setq mac-pass-command-to-system nil) ; so that Cmd+H won't activate Hide Current App and Cmd+Shift+q won't logout user. +; so that Cmd+H won't activate Hide Current +; App and Cmd+Shift+q won't logout user. +(setq mac-pass-command-to-system nil) + +(set-face-attribute 'default nil :height 100) + +;; use y or n instead of yes or no +(fset 'yes-or-no-p 'y-or-n-p)
--- a/.elisp/textmate.el +++ b/.elisp/textmate.el @@ -326,7 +326,7 @@ specific type of file." (concat " | grep -v " (shell-quote-argument *textmate-vcs-exclude*)) "") - " | xargs grep -nR " + " | xargs egrep -nR " (if pattern (concat " --include='" pattern "' ") "") " -- " (shell-quote-argument re)))
--- a/.emacs +++ b/.emacs @@ -1,7 +1,7 @@ ;; Augie Fackler's .emacs file ; Places I've stolen from: ; Karl Fogel: http://svn.red-bean.com/repos/kfogel/trunk -; Dave Anderson: +; Dave Anderson: https://ssl.natulte.net/hg/dotfiles/ ; Emacs Starter Kit: http://github.com/technomancy/emacs-starter-kit (add-to-list 'load-path (expand-file-name "~/.elisp"))
--- a/.shell.d/50.vcs_functions.sh +++ b/.shell.d/50.vcs_functions.sh @@ -193,6 +193,11 @@ function vcs_current_branch() { return 1 } +function git_next_unmerged_file() { + git status | grep unmerged | head -n 1 | sed 's/.*: //' +} +alias git-next-unmerged-file=git_next_unmerged_file + # change to the root dir of the current wc function wcroot() { local root=`hg root 2> /dev/null`