Merge branch 'maint'

This commit is contained in:
Lukas Fleischer
2013-02-04 20:11:58 +01:00
49 changed files with 81 additions and 63 deletions

View File

@@ -1,7 +1,7 @@
/*
* Calcurse - text-based organizer
*
* Copyright (c) 2004-2012 calcurse Development Team <misc@calcurse.org>
* Copyright (c) 2004-2013 calcurse Development Team <misc@calcurse.org>
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -979,6 +979,12 @@ void custom_keys_config(void)
} else
not_recognized = 0;
/* Is the binding used by this action already? If so, just end the reassignment */
if (selrow == keys_get_action(keyval)) {
delwin(grabwin);
break;
}
used = keys_assign_binding(keyval, selrow);
if (used) {
enum key action;