summaryrefslogtreecommitdiffstats
path: root/mutt.h
diff options
context:
space:
mode:
authorKevin McCarthy <kevin@8t8.us>2020-05-11 14:15:27 -0700
committerKevin McCarthy <kevin@8t8.us>2020-05-11 14:15:27 -0700
commitb0570d76c97135dd38a4cde8262792f7a763cfba (patch)
tree9086cc47a51f65fac59ec84fa2df14043b67002e /mutt.h
parentd338650ff662d308a1a99b902b4bf9ac93a14685 (diff)
Separate mailbox vs buffy-incoming for the "enter_fname" functions.
Create mutt_buffer_enter_mailbox(), which turns on the MUTT_MAILBOX flag (renamed from MUTT_EFILE). This uses the mailbox history file category, and turns on MUTT_SEL_FOLDER in the select_file browser. Add a do_incoming paramter and a new separate flag MUTT_INCOMING, so that buffy-completion can be enabled optionally for mailboxes. It only makes sense for the change-folder operation, so disable it in other contexts (such as saving/copying a message, prompting for an Fcc mailbox, or an autocrypt scan mailbox). Change saving/copying a message to use the mailbox function, so that it shares the history file with other mailbox operations. It would previously use the "file" history category. Create mutt_buffer_enter_filenames() to replace the enter_fname() prompt for files. Since nothing directly uses the _mutt_buffer_enter_fname() function anymore, rename and make it static.
Diffstat (limited to 'mutt.h')
-rw-r--r--mutt.h19
1 files changed, 10 insertions, 9 deletions
diff --git a/mutt.h b/mutt.h
index 4413739f..b1fe8d64 100644
--- a/mutt.h
+++ b/mutt.h
@@ -107,15 +107,16 @@ struct timespec
#include "mutt_regex.h"
/* flags for mutt_enter_string() */
-#define MUTT_ALIAS 1 /* do alias "completion" by calling up the alias-menu */
-#define MUTT_FILE (1<<1) /* do file completion */
-#define MUTT_EFILE (1<<2) /* do file completion, plus incoming folders */
-#define MUTT_CMD (1<<3) /* do completion on previous word */
-#define MUTT_PASS (1<<4) /* password mode (no echo) */
-#define MUTT_CLEAR (1<<5) /* clear input if printable character is pressed */
-#define MUTT_COMMAND (1<<6) /* do command completion */
-#define MUTT_PATTERN (1<<7) /* pattern mode - only used for history classes */
-#define MUTT_LABEL (1<<8) /* do label completion */
+#define MUTT_ALIAS 1 /* do alias "completion" by calling up the alias-menu */
+#define MUTT_FILE (1<<1) /* do file completion, file history ring */
+#define MUTT_MAILBOX (1<<2) /* do file completion, mailbox history ring */
+#define MUTT_INCOMING (1<<3) /* do incoming folders buffy cycle */
+#define MUTT_CMD (1<<4) /* do completion on previous word */
+#define MUTT_PASS (1<<5) /* password mode (no echo) */
+#define MUTT_CLEAR (1<<6) /* clear input if printable character is pressed */
+#define MUTT_COMMAND (1<<7) /* do command completion */
+#define MUTT_PATTERN (1<<8) /* pattern mode - only used for history classes */
+#define MUTT_LABEL (1<<9) /* do label completion */
/* flags for mutt_get_token() */
#define MUTT_TOKEN_EQUAL 1 /* treat '=' as a special */