X-Git-Url: https://git.llucax.com/software/mutt-debian.git/blobdiff_plain/3799c7942e787a60a5b990d87f7f58208d5ec08e..768c27a5cb81470aca4567e9f289619ad5d42eca:/debian/patches/debian-specific/use_usr_bin_editor.diff

diff --git a/debian/patches/debian-specific/use_usr_bin_editor.diff b/debian/patches/debian-specific/use_usr_bin_editor.diff
index ae5f6b7..c5a475b 100644
--- a/debian/patches/debian-specific/use_usr_bin_editor.diff
+++ b/debian/patches/debian-specific/use_usr_bin_editor.diff
@@ -1,6 +1,9 @@
---- init.c.orig
-+++ init.c
-@@ -2929,7 +2929,7 @@
+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
+
+--- a/init.c
++++ b/init.c
+@@ -3114,7 +3114,7 @@ void mutt_init (int skip_sys_rc, LIST *c
    {
      p = getenv ("EDITOR");
      if (!p)
@@ -9,14 +12,14 @@
    }
    Editor = safe_strdup (p);
    Visual = safe_strdup (p);
---- init.h.orig
-+++ init.h
-@@ -551,7 +551,7 @@
+--- a/init.h
++++ b/init.h
+@@ -589,7 +589,7 @@ struct option_t MuttVars[] = {
    ** .pp
    ** This variable specifies which editor is used by mutt.
-   ** It defaults to the value of the VISUAL, or EDITOR, 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.
+   ** 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.
    */
    { "encode_from",	DT_BOOL, R_NONE, OPTENCODEFROM, 0 },
    /*