Hrm, the sensible-editor patch (sorry for the faulty one) should be:

diff -rN -u old-tmp/DarcsArguments.lhs new-tmp/DarcsArguments.lhs
--- old-tmp/DarcsArguments.lhs  2006-04-15 11:47:23.384903652 +0200
+++ new-tmp/DarcsArguments.lhs  2006-04-15 11:47:23.488878363 +0200
@@ -892,6 +892,7 @@
 edit_file f = do
   ed <- get_editor
   exec_interactive ed [f]
+             `ortryrunning` exec_interactive "vi" [f]
              `ortryrunning` exec_interactive "emacs" [f]
              `ortryrunning` exec_interactive "emacs" ["-nw",f]
              `ortryrunning` exec_interactive "nano" [f]
@@ -899,7 +900,7 @@
 get_editor = getEnv "DARCS_EDITOR" `catchall`
              getEnv "DARCSEDITOR" `catchall`
              getEnv "VISUAL" `catchall`
-             getEnv "EDITOR" `catchall` return "vi"
+             getEnv "EDITOR" `catchall` return "sensible-editor"
 \end{code}
 
 \begin{code}




But since debian's sensible-editor does most of this anyway, it
could even be:


diff -rN -u old-tmp/DarcsArguments.lhs new-tmp/DarcsArguments.lhs
--- old-tmp/DarcsArguments.lhs  2006-04-15 12:11:40.321590965 +0200
+++ new-tmp/DarcsArguments.lhs  2006-04-15 12:11:40.414568309 +0200
@@ -892,14 +892,9 @@
 edit_file f = do
   ed <- get_editor
   exec_interactive ed [f]
-             `ortryrunning` exec_interactive "emacs" [f]
-             `ortryrunning` exec_interactive "emacs" ["-nw",f]
-             `ortryrunning` exec_interactive "nano" [f]
+
 get_editor :: IO String
-get_editor = getEnv "DARCS_EDITOR" `catchall`
-             getEnv "DARCSEDITOR" `catchall`
-             getEnv "VISUAL" `catchall`
-             getEnv "EDITOR" `catchall` return "vi"
+get_editor = getEnv "DARCS_EDITOR" `catchall` return "sensible-editor"
 \end{code}
 
 \begin{code}



-- 
Tommy Pettersson <[EMAIL PROTECTED]>


-- 
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]

Reply via email to