summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlec Warner <antarus@gentoo.org>2006-02-03 23:54:45 +0000
committerAlec Warner <antarus@gentoo.org>2006-02-03 23:54:45 +0000
commitfb26c15fadc2e960ddeec3b3b9b4da1e7ce17af6 (patch)
treeaeabf2ae5a49ba1b67ff88a053648c1e26237457
parent236e4e28c461bdddb2e86494890558227afba5c0 (diff)
downloadportage-fb26c15fadc2e960ddeec3b3b9b4da1e7ce17af6.tar.gz
portage-fb26c15fadc2e960ddeec3b3b9b4da1e7ce17af6.tar.bz2
portage-fb26c15fadc2e960ddeec3b3b9b4da1e7ce17af6.zip
Fix bug #86067. Thanks to J\xc3\xbcrgen H\xc3\xb6tzel <gentoo@hoetzel.info> for the emacs command
svn path=/main/trunk/; revision=2646
-rw-r--r--cnf/etc-update.conf10
1 files changed, 7 insertions, 3 deletions
diff --git a/cnf/etc-update.conf b/cnf/etc-update.conf
index 379dd1636..74047b030 100644
--- a/cnf/etc-update.conf
+++ b/cnf/etc-update.conf
@@ -21,12 +21,17 @@ cp_opts="-i"
pager="less"
#pager=""
+# For emacs-users bug #86067
+# diff_command="eval emacs -nw --eval=\(ediff\ \"%file1\"\ \"%file2\"\)"
+#using_editor=1
+
# vim-users: you CAN use vimdiff for diff_command. (see NOTE_1)
-diff_command="diff -uN %file1 %file2"
-using_editor=0
#diff_command="vim -d %file1 %file2"
#using_editor=1
+diff_command="diff -uN %file1 %file2"
+using_editor=0
+
# vim-users: don't use vimdiff for merging (see NOTE_1)
merge_command="sdiff -s -o %merged %orig %new"
@@ -68,4 +73,3 @@ merge_command="sdiff -s -o %merged %orig %new"
# choose while using those programs)
# NOTE_2: Make sure pager is set to "" when using an editor as diff_command!
-