#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 (MCore.beep) beep(); } while (0)
#if ! (defined(USE_SLANG_CURSES) || defined(HAVE_CURS_SET))
#define curs_set(x)
void mutt_progress_bar (progress_t* progress, long pos);
void mutt_clear_error (void);
-void mutt_edit_file (const char *, 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 *, ...)