diff options
author | Lukas Fleischer <calcurse@cryptocrack.de> | 2011-07-28 13:38:12 +0200 |
---|---|---|
committer | Lukas Fleischer <calcurse@cryptocrack.de> | 2011-07-28 13:38:12 +0200 |
commit | 54813eef19ae545bf29aa2885c15cc923cea2840 (patch) | |
tree | c3a5f0f04a6009509e1939782a7b52529a465161 | |
parent | a232c9af33ee2c77c89afef99f17c7c557c77e01 (diff) | |
parent | 8681af3c6d43ab7aa48dc49cd12058e9ba3d488e (diff) | |
download | calcurse-54813eef19ae545bf29aa2885c15cc923cea2840.zip |
Merge branch 'maint'
-rw-r--r-- | src/args.c | 2 | ||||
-rw-r--r-- | src/io.c | 4 |
2 files changed, 4 insertions, 2 deletions
@@ -880,6 +880,8 @@ parse_args (int argc, char **argv, struct conf *conf) { io_check_file (path_apts, (int *)0); io_check_file (path_todo, (int *)0); + /* Get default pager in case we need to show a log file. */ + vars_init (conf); io_load_app (); io_load_todo (); io_import_data (IO_IMPORT_ICAL, conf, ifile); @@ -2423,10 +2423,10 @@ ical_read_event (FILE *fdi, FILE *log, unsigned *noevents, unsigned *noapoints, { const int ITEMLINE = *lineno; const struct string endevent = STRING_BUILD ("END:VEVENT"); - const struct string summary = STRING_BUILD ("SUMMARY:"); + const struct string summary = STRING_BUILD ("SUMMARY"); const struct string dtstart = STRING_BUILD ("DTSTART"); const struct string dtend = STRING_BUILD ("DTEND"); - const struct string duration = STRING_BUILD ("DURATION:"); + const struct string duration = STRING_BUILD ("DURATION"); const struct string rrule = STRING_BUILD ("RRULE"); const struct string exdate = STRING_BUILD ("EXDATE"); const struct string alarm = STRING_BUILD ("BEGIN:VALARM"); |