From: Alec Warner <antarus@gentoo.org>
Date: Fri, 3 Feb 2006 23:54:45 +0000 (-0000)
Subject: Fix bug #86067.  Thanks to J\xc3\xbcrgen H\xc3\xb6tzel <gentoo@hoetzel.info> for... 
X-Git-Tag: v2.1_pre5_2760~97
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=fb26c15fadc2e960ddeec3b3b9b4da1e7ce17af6;p=portage.git

Fix bug #86067.  Thanks to J\xc3\xbcrgen H\xc3\xb6tzel <gentoo@hoetzel.info> for the emacs command

svn path=/main/trunk/; revision=2646
---

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!
-