Created
November 11, 2011 05:42
-
-
Save nanasess/1357296 to your computer and use it in GitHub Desktop.
dvc-bzr multilingual patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
[ALIASES] | |
diff=diff --diff-options '--strip-trailing-cr' |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
=== 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 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
#!/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