Skip to content

Instantly share code, notes, and snippets.

@nanasess
Created November 11, 2011 05:42
Show Gist options
  • Save nanasess/1357296 to your computer and use it in GitHub Desktop.
Save nanasess/1357296 to your computer and use it in GitHub Desktop.
dvc-bzr multilingual patch
[ALIASES]
diff=diff --diff-options '--strip-trailing-cr'
=== modified file 'lisp/bzr.el'
--- old/lisp/bzr.el 2010-10-17 07:00:40.000000000 +0900
+++ dvc/lisp/bzr.el 2011-11-14 15:35:48.000000000 +0900
@@ -348,7 +348,7 @@
(dvc-save-some-buffers root)
(dvc-run-dvc-async
'bzr `("diff" ,@(when against
- (list "--revision"
+ (list (concat "--using=" (expand-file-name (concat user-emacs-directory "ldiff"))) "--revision"
(bzr-revision-id-to-string
against))))
:finished
@@ -398,6 +398,7 @@
(t default-directory))))
(dvc-run-dvc-async
'bzr `("diff"
+ ,(concat "--using=" (expand-file-name (concat user-emacs-directory "ldiff")))
"--revision" ,(concat base-str ".." modified-str)
,extra-arg)
:finished
#!/bin/sh
export LANG=ja_JP.UTF-8
diff --strip-trailing-cr -uNr "$@" | lv
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment