fyb/calcurse-edge
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'maint'

Browse Source
This commit is contained in:
Lukas Fleischer 2013-02-02 16:39:16 +01:00
commit 308ba7c983
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/interaction.c
View File

@ -107,7 +107,8 @@ static void update_start_time(long *start, long *dur)
const char *msg_enter = _("Press [Enter] to continue"); const char *msg_enter = _("Press [Enter] to continue");
do { do {
day_edit_time(*start, &hr, &mn); if (!day_edit_time(*start, &hr, &mn))
break;
newtime = update_time_in_date(*start, hr, mn); newtime = update_time_in_date(*start, hr, mn);
if (newtime < *start + *dur) { if (newtime < *start + *dur) {
*dur -= (newtime - *start); *dur -= (newtime - *start);
@ -126,8 +127,8 @@ static void update_duration(long *start, long *dur)
{ {
unsigned newdur; unsigned newdur;
day_edit_duration(*start, *dur, &newdur); if (day_edit_duration(*start, *dur, &newdur))
*dur = newdur; *dur = newdur;
} }
static void update_desc(char **desc) static void update_desc(char **desc)

6
src/io.c
View File

@ -526,7 +526,8 @@ void io_load_app(void)
if (c == '!') { if (c == '!') {
ungetc(c, data_file); ungetc(c, data_file);
recur_exc_scan(&exc, data_file); recur_exc_scan(&exc, data_file);
c = getc(data_file); while ((c = getc(data_file)) == ' ') ;
ungetc(c, data_file);
} else if (c == '}') { } else if (c == '}') {
while ((c = getc(data_file)) == ' ') ; while ((c = getc(data_file)) == ' ') ;
ungetc(c, data_file); ungetc(c, data_file);
@ -535,7 +536,8 @@ void io_load_app(void)
} else if (c == '!') { /* endless item with exceptions */ } else if (c == '!') { /* endless item with exceptions */
ungetc(c, data_file); ungetc(c, data_file);
recur_exc_scan(&exc, data_file); recur_exc_scan(&exc, data_file);
c = getc(data_file); while ((c = getc(data_file)) == ' ') ;
ungetc(c, data_file);
until.tm_year = 0; until.tm_year = 0;
} else { } else {
io_load_error(path_apts, line, io_load_error(path_apts, line,