Introduce mutt_curses_message/mutt_nocurses_message. From Olaf Kirch.

diff --git a/curs_lib.c b/curs_lib.c
index 8a4aa17dff646fe743bc63b2a91803090a5f0052..aac02de3d65829e9c4a160e31e6940b68db4e3cf 100644 (file)
--- a/curs_lib.c
+++ b/curs_lib.c
@@ -264,7 +264,7 @@ void mutt_curses_error (const char *fmt, ...)
   set_option (OPTMSGERR);
 }
 
-void mutt_message (const char *fmt, ...)
+void mutt_curses_message (const char *fmt, ...)
 {
   va_list ap;
 

diff --git a/globals.h b/globals.h
index d90e7a3d78b4dbb5f783fddfdcb5291f2f90a49a..936b8b9e2e0bbb1cf405165bb392a490c0ba638b 100644 (file)
--- a/globals.h
+++ b/globals.h
@@ -17,6 +17,7 @@
  */ 
 
 WHERE void (*mutt_error) (const char *, ...);
+WHERE void (*mutt_message) (const char *, ...);
 
 WHERE CONTEXT *Context;
 

diff --git a/main.c b/main.c
index b534f3fe2da2335eaffa384fe856f658d9c9b0b3..4179b1fc74a0a1ee89b508a479d808fd1e555b13 100644 (file)
--- a/main.c
+++ b/main.c
@@ -472,6 +472,7 @@ int main (int argc, char **argv)
   setlocale (LC_CTYPE, "");
 
   mutt_error = mutt_nocurses_error;
+  mutt_message = mutt_nocurses_error;
   SRAND (time (NULL));
   umask (077);
 
@@ -610,6 +611,7 @@ int main (int argc, char **argv)
     SETCOLOR (MT_COLOR_NORMAL);
     clear ();
     mutt_error = mutt_curses_error;
+    mutt_message = mutt_curses_message;
   }
 
   /* Create the Maildir directory if it doesn't exist. */

diff --git a/protos.h b/protos.h
index 5a5a4ec261fb9afc42d29ffeb7cac3d90d3328da..f254ecf669df5c42daf0c1e8ad634d988a46fee8 100644 (file)
--- a/protos.h
+++ b/protos.h
@@ -155,6 +155,7 @@ void mutt_edit_content_type (HEADER *, BODY *);
 void mutt_edit_file (const char *, const char *);
 void mutt_edit_headers (const char *, const char *, HEADER *, char *, size_t);
 void mutt_curses_error (const char *, ...);
+void mutt_curses_message (const char *, ...);
 void mutt_enter_command (void);
 void mutt_expand_aliases_env (ENVELOPE *);
 void mutt_expand_file_fmt (char *, size_t, const char *, const char *);
@@ -181,7 +182,6 @@ void mutt_make_forward_subject (ENVELOPE *env, CONTEXT *ctx, HEADER *cur);
 void mutt_make_help (char *, size_t, char *, int, int);
 void mutt_make_misc_reply_headers (ENVELOPE *env, CONTEXT *ctx, HEADER *cur, ENVELOPE *curenv);
 void mutt_make_post_indent (CONTEXT *ctx, HEADER *cur, FILE *out);
-void mutt_message (const char *, ...);
 void mutt_message_to_7bit (BODY *, FILE *);
 void mutt_mktemp (char *);
 void mutt_normalize_time (struct tm *);