[mutt] 06/17: use_usr_bin_editor

[Antonio Radici]

This is an automated email from the git hooks/post-receive script.

antonio pushed a commit to branch patch-queue/master
in repository mutt.

commit a0629287850be8b6ba9f946f4c51efe74274ef8e
Author: Antonio Radici <antonio at debian.org>
Date:   Thu Feb 27 16:06:15 2014 +0100

    use_usr_bin_editor
    
    Even if EDITOR is not set, mutt will always use /usr/bin/editor
    (which is set by update-alternatives), rather than falling back
    to vi.
    
    Gbp-Pq: Topic debian-specific
    Gbp-Pq: Name use_usr_bin_editor.patch
---
 init.c | 2 +-
 init.h | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/init.c b/init.c
index ba6c03c..1d373d1 100644
--- a/init.c
+++ b/init.c
@@ -3385,7 +3385,7 @@ void mutt_init (int skip_sys_rc, LIST *commands)
   {
     p = getenv ("EDITOR");
     if (!p)
-      p = "vi";
+      p = "/usr/bin/editor";
   }
   Editor = safe_strdup (p);
   Visual = safe_strdup (p);
diff --git a/init.h b/init.h
index dff4dd0..aa28c0f 100644
--- a/init.h
+++ b/init.h
@@ -750,7 +750,7 @@ struct option_t MuttVars[] = {
   ** .pp
   ** This variable specifies which editor is used by mutt.
   ** It defaults to the value of the \fC$$$VISUAL\fP, or \fC$$$EDITOR\fP, environment
-  ** variable, or to the string ``vi'' if neither of those are set.
+  ** variable, or to the string ``/usr/bin/editor'' if neither of those are set.
   ** .pp
   ** The \fC$$editor\fP string may contain a \fI%s\fP escape, which will be replaced by the name
   ** of the file to be edited.  If the \fI%s\fP escape does not appear in \fC$$editor\fP, a

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-mutt/mutt.git