From ab0fe682255f01e75b70a6ee3e95795020be8dd7 Mon Sep 17 00:00:00 2001 From: Lars Henriksen Date: Wed, 22 Aug 2018 20:18:36 +0200 Subject: Reload data after resolving save conflict (improved) After resolving a save conflict with the merge tool, a save operation has, in effect, occurred, and data files must be reloaded to import the result of the conflict resolution. This is a replacement for commit 2fe9c7e. The operations concerned with the user interface are kept out the io-operations (as in all other cases) and take place at the command-level in calcurse.c. and not at the io-level (io.c). Shorter, more concise prompt texts. Signed-off-by: Lars Henriksen Signed-off-by: Lukas Fleischer --- src/calcurse.h | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'src/calcurse.h') diff --git a/src/calcurse.h b/src/calcurse.h index 88a0916..9bb714c 100644 --- a/src/calcurse.h +++ b/src/calcurse.h @@ -652,6 +652,13 @@ enum getstr { #define PARSE_DATETIME_HAS_DATE (1 << 0) #define PARSE_DATETIME_HAS_TIME (1 << 1) +/* Return codes for the io_save_cal() function. */ +enum { + IO_SAVE_CTINUE, + IO_SAVE_RELOAD, + IO_SAVE_CANCEL +}; + /* Week days. */ enum wday { SUNDAY, @@ -848,7 +855,7 @@ unsigned io_save_apts(const char *); void io_dump_todo(const char *); unsigned io_save_todo(const char *); unsigned io_save_keys(void); -void io_save_cal(enum save_display); +int io_save_cal(enum save_display); void io_load_app(struct item_filter *); void io_load_todo(struct item_filter *); void io_load_data(struct item_filter *); -- cgit v1.2.3-54-g00ecf