From: Pierre Habouzit <madcoder@debian.org>
Date: Sat, 11 Aug 2007 09:52:22 +0000 (+0200)
Subject: Remove useless options and tests.
X-Git-Url: http://git.madism.org/?a=commitdiff_plain;h=198a7600d7538ba6f9e260037ee90d0c7f7e5bf2;p=apps%2Fmadmutt.git

Remove useless options and tests.

Signed-off-by: Pierre Habouzit <madcoder@debian.org>
---

diff --git a/init.h b/init.h
index e99e78a..af4329d 100644
--- a/init.h
+++ b/init.h
@@ -1051,17 +1051,6 @@ struct option_t MuttVars[] = {
    ** is cleared and the next or previous page of the menu is displayed
    ** (useful for slow links to avoid many redraws).
    */
-  {"meta_key", DT_BOOL, R_NONE, OPTMETAKEY, "no" },
-  /*
-   ** .pp
-   ** If \fIset\fP, forces Madmutt to interpret keystrokes with the high bit (bit 8)
-   ** set as if the user had pressed the \fTESC\fP key and whatever key remains
-   ** after having the high bit removed.  For example, if the key pressed
-   ** has an ASCII value of \fT0xf8\fP, then this is treated as if the user had
-   ** pressed \fTESC\fP then ``\fTx\fP''.  This is because the result of removing the
-   ** high bit from ``\fT0xf8\fP'' is ``\fT0x78\fP'', which is the ASCII character
-   ** ``\fTx\fP''.
-   */
   {"mh_purge", DT_BOOL, R_NONE, OPTMHPURGE, "no" },
   /*
    ** .pp
diff --git a/lib-ui/curs_lib.c b/lib-ui/curs_lib.c
index c50c18d..72560b6 100644
--- a/lib-ui/curs_lib.c
+++ b/lib-ui/curs_lib.c
@@ -43,29 +43,23 @@ static event_t *KeyEvent;
 
 void mutt_refresh (void)
 {
-  /* don't refresh when we are waiting for a child. */
-  if (option (OPTKEEPQUIET))
-    return;
+    /* don't refresh when we are waiting for a child. */
+    if (option (OPTKEEPQUIET))
+        return;
 
-  /* don't refresh in the middle of macros unless necessary */
-  if (UngetCount && !option (OPTFORCEREFRESH))
-    return;
+    /* don't refresh in the middle of macros unless necessary */
+    if (UngetCount && !option (OPTFORCEREFRESH))
+        return;
 
-  /* else */
-  refresh ();
+    /* else */
+    refresh ();
 }
 
-/* Make sure that the next refresh does a full refresh.  This could be
-   optmized by not doing it at all if DISPLAY is set as this might
-   indicate that a GUI based pinentry was used.  Having an option to
-   customize this is of course the Mutt way.  */
 void mutt_need_hard_redraw (void)
 {
-  if (!getenv ("DISPLAY")) {
     keypad (stdscr, TRUE);
     clearok (stdscr, TRUE);
     set_option (OPTNEEDREDRAW);
-  }
 }
 
 event_t mutt_getch (void)
@@ -88,15 +82,6 @@ event_t mutt_getch (void)
   if (ch == ERR)
     return err;
 
-  if ((ch & 0x80) && option (OPTMETAKEY)) {
-    /* send ALT-x as ESC-x */
-    ch &= ~0x80;
-    mutt_ungetch (ch, 0);
-    ret.ch = '\033';
-    ret.op = 0;
-    return ret;
-  }
-
   ret.ch = ch;
   ret.op = 0;
   return (ch == ctrl ('G') ? err : ret);
diff --git a/mutt.h b/mutt.h
index d324819..06b9fbb 100644
--- a/mutt.h
+++ b/mutt.h
@@ -251,7 +251,6 @@ enum {
   OPTMBOXPANE,
   OPTMENUSCROLL,                /* scroll menu instead of implicit next-page */
   OPTMENUMOVEOFF,
-  OPTMETAKEY,                   /* interpret ALT-x as ESC-x */
   OPTMETOO,
   OPTMHPURGE,
   OPTMIMEFORWDECODE,