X-Git-Url: http://git.madism.org/?a=blobdiff_plain;f=lib-ui%2Fcurses.h;h=c33a93d90160b88b5cf45eab5f6696dc67c0d76a;hb=e1ffef197d9dc7fdc79f9149c123f4cd0809ab63;hp=074a93c87f78dadd9518a8f123bcd9d30d9346b8;hpb=15d63145b9f11a1fa58c74abbeab7533ea2e5d21;p=apps%2Fmadmutt.git

diff --git a/lib-ui/curses.h b/lib-ui/curses.h
index 074a93c..c33a93d 100644
--- a/lib-ui/curses.h
+++ b/lib-ui/curses.h
@@ -62,7 +62,7 @@
 #define CLEARLINE_WIN(x) move(x,(option(OPTMBOXPANE)?SidebarWidth:0)), clrtoeol()
 #define CLEARLINE(x) move(x,0), clrtoeol()
 #define CENTERLINE(x,y) move(y, (COLS-strlen(x))/2), addstr(x)
-#define BEEP() do { if (option (OPTBEEP)) beep(); } while (0)
+#define BEEP() do { if (mod_core.beep) beep(); } while (0)
 
 #if ! (defined(USE_SLANG_CURSES) || defined(HAVE_CURS_SET))
 #define curs_set(x)
@@ -147,9 +147,11 @@ typedef struct {
 
 void mutt_progress_bar (progress_t* progress, long pos);
 void mutt_clear_error (void);
-void mutt_edit_file (const char *, const char *);
-void mutt_curses_error (const char *, ...);
-void mutt_curses_message (const char *, ...);
+void mutt_edit_file (const char *);
+void mutt_curses_error (const char *, ...)
+    __attribute__((format(printf, 1, 2)));
+void mutt_curses_message (const char *, ...)
+    __attribute__((format(printf, 1, 2)));
 void mutt_format_string (char *, ssize_t, int, int, int, char, const char *,
                          ssize_t, int);
 void mutt_format_s (char *, ssize_t, const char *, const char *);
@@ -177,7 +179,7 @@ int mutt_get_field_unbuffered (char *, char *, ssize_t, int);
 int mutt_index_menu (void);
 int mutt_is_mail_list (address_t *);
 int mutt_is_subscribed_list (address_t *);
-int mutt_multi_choice (char *prompt, char *letters);
+int mutt_multi_choice (const char *prompt, const char *letters);
 int mutt_parse_color (BUFFER *, BUFFER *, unsigned long, BUFFER *);
 int mutt_parse_uncolor (BUFFER *, BUFFER *, unsigned long, BUFFER *);
 int mutt_parse_mono (BUFFER *, BUFFER *, unsigned long, BUFFER *);