Only use keypad() when curses is running

diff --git a/ChangeLog b/ChangeLog
index 37d583e850da155717fd3263371a0088dce8724e..2cdcb2f5dc0b7c136a4fae4f8dc9d9fd4fb66693 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2009-06-23 00:28 -0700  Vincent Lefevre  <vincent@vinc17.org>  (642987450d83)
+
+       * curs_lib.c: Only beep when displaying error messages (unbreaks
+       [54bc1ef602e7])
+
+2009-06-23 00:20 -0700  Brendan Cully  <brendan@kublai.com>  (f5849c72a274)
+
+       * ChangeLog, crypt-gpgme.c: Update crypt-gpgme for mutt_mktemp change
+       in [ed7eb5de7536]
+
 2009-06-22 17:36 +0200  Rocco Rutte  <pdmef@gmx.net>  (54bc1ef602e7)
 
        * curs_lib.c: Make mutt_curses_(error|message) format message to COLS

diff --git a/commands.c b/commands.c
index 3b009978f1511a7e38ca06d3fd42e648624d7fbf..9ce897b5d4cabdf83e1038310ab9649c10f5bd78 100644 (file)
--- a/commands.c
+++ b/commands.c
@@ -222,7 +222,8 @@ int mutt_display_message (HEADER *cur)
     if ((r = mutt_system (buf)) == -1)
       mutt_error (_("Error running \"%s\"!"), buf);
     unlink (tempfile);
-    keypad (stdscr, TRUE);
+    if (!option (OPTNOCURSES))
+      keypad (stdscr, TRUE);
     if (r != -1)
       mutt_set_flag (Context, cur, M_READ, 1);
     if (r != -1 && option (OPTPROMPTAFTER))