Merge branch 'maint'

33 files changed, 42 insertions, 35 deletions

diff --git a/src/apoint.c b/src/apoint.c
index 9b9257f..64f9f55 100644
--- a/src/apoint.c
+++ b/src/apoint.c
@@ -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
diff --git a/src/args.c b/src/args.c
index 85c91cb..12d33c5 100644
--- a/src/args.c
+++ b/src/args.c
@@ -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
@@ -79,7 +79,7 @@ static void usage_try(void)
 static void version_arg(void)
 {
   const char *vtext =
-      _("\nCopyright (c) 2004-2012 calcurse Development Team.\n"
+      _("\nCopyright (c) 2004-2013 calcurse Development Team.\n"
         "This is free software; see the source for copying conditions.\n");
 
   fprintf(stdout, _("Calcurse %s - text-based organizer\n"), VERSION);
diff --git a/src/calcurse.c b/src/calcurse.c
index e179e8c..a8dace1 100644
--- a/src/calcurse.c
+++ b/src/calcurse.c
@@ -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
@@ -146,6 +146,7 @@ static inline void key_add_item(void)
     interact_day_item_add();
     inday = do_storage(0);
     wins_update(FLAG_CAL | FLAG_APP | FLAG_STA);
+    break;
   case TOD:
     interact_todo_add();
     if (todo_hilt() == 0 && todo_nb() == 1)
diff --git a/src/calcurse.h b/src/calcurse.h
index c31f322..dd974a8 100644
--- a/src/calcurse.h
+++ b/src/calcurse.h
@@ -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
diff --git a/src/calendar.c b/src/calendar.c
index 313ec53..cad9ad9 100644
--- a/src/calendar.c
+++ b/src/calendar.c
@@ -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
diff --git a/src/config.c b/src/config.c
index da562b2..83d1a93 100644
--- a/src/config.c
+++ b/src/config.c
@@ -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
diff --git a/src/custom.c b/src/custom.c
index 8eb3ef0..df344c2 100644
--- a/src/custom.c
+++ b/src/custom.c
@@ -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;
diff --git a/src/day.c b/src/day.c
index 74e6db0..4c2f5bf 100644
--- a/src/day.c
+++ b/src/day.c
@@ -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
diff --git a/src/dmon.c b/src/dmon.c
index f8d3403..0fd7962 100644
--- a/src/dmon.c
+++ b/src/dmon.c
@@ -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
diff --git a/src/event.c b/src/event.c
index dca6820..b1186a3 100644
--- a/src/event.c
+++ b/src/event.c
@@ -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
diff --git a/src/getstring.c b/src/getstring.c
index cc2a949..3b7224d 100644
--- a/src/getstring.c
+++ b/src/getstring.c
@@ -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
diff --git a/src/help.c b/src/help.c
index d9afd4c..289f814 100644
--- a/src/help.c
+++ b/src/help.c
@@ -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
@@ -736,7 +736,7 @@ void help_screen(void)
 
   hscr[HELP_CREDITS].title = _("Calcurse - text-based organizer");
   snprintf(hscr[HELP_CREDITS].text, HELPTEXTSIZ,
-           _("\nCopyright (c) 2004-2012 calcurse Development Team\n"
+           _("\nCopyright (c) 2004-2013 calcurse Development Team\n"
              "All rights reserved.\n"
              "\n"
              "Redistribution and use in source and binary forms, with or without\n"
diff --git a/src/htable.h b/src/htable.h
index 3bde5ef..a9317e0 100644
--- a/src/htable.h
+++ b/src/htable.h
@@ -1,5 +1,5 @@
 /*
- * 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
diff --git a/src/ical.c b/src/ical.c
index 1a4af6e..b716c8d 100644
--- a/src/ical.c
+++ b/src/ical.c
@@ -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
diff --git a/src/interaction.c b/src/interaction.c
index c313ce9..49ebac5 100644
--- a/src/interaction.c
+++ b/src/interaction.c
@@ -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
diff --git a/src/io.c b/src/io.c
index ff8d1ea..8923ba5 100644
--- a/src/io.c
+++ b/src/io.c
@@ -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
diff --git a/src/keys.c b/src/keys.c
index a870882..5d53a1e 100644
--- a/src/keys.c
+++ b/src/keys.c
@@ -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
diff --git a/src/llist.c b/src/llist.c
index f771ef3..54f1e79 100644
--- a/src/llist.c
+++ b/src/llist.c
@@ -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
diff --git a/src/llist.h b/src/llist.h
index a786358..7c4d590 100644
--- a/src/llist.h
+++ b/src/llist.h
@@ -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
diff --git a/src/llist_ts.h b/src/llist_ts.h
index b452377..7663a2d 100644
--- a/src/llist_ts.h
+++ b/src/llist_ts.h
@@ -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
diff --git a/src/mem.c b/src/mem.c
index ecb8aa4..8889cc0 100644
--- a/src/mem.c
+++ b/src/mem.c
@@ -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
diff --git a/src/note.c b/src/note.c
index d2f7ab2..9508ea5 100644
--- a/src/note.c
+++ b/src/note.c
@@ -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
diff --git a/src/notify.c b/src/notify.c
index c739829..cb56e8c 100644
--- a/src/notify.c
+++ b/src/notify.c
@@ -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
diff --git a/src/pcal.c b/src/pcal.c
index 4c00ddc..8bcc0b5 100644
--- a/src/pcal.c
+++ b/src/pcal.c
@@ -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
diff --git a/src/recur.c b/src/recur.c
index 1c593c2..e9312e7 100644
--- a/src/recur.c
+++ b/src/recur.c
@@ -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
diff --git a/src/sha1.c b/src/sha1.c
index 4fbf245..0388e3c 100644
--- a/src/sha1.c
+++ b/src/sha1.c
@@ -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
diff --git a/src/sha1.h b/src/sha1.h
index 8f90ff5..8f80bef 100644
--- a/src/sha1.h
+++ b/src/sha1.h
@@ -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
diff --git a/src/sigs.c b/src/sigs.c
index 77ef6b8..68dcdfd 100644
--- a/src/sigs.c
+++ b/src/sigs.c
@@ -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
diff --git a/src/todo.c b/src/todo.c
index 2a207e2..015f43f 100644
--- a/src/todo.c
+++ b/src/todo.c
@@ -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
diff --git a/src/utf8.c b/src/utf8.c
index 398b142..6ec8eca 100644
--- a/src/utf8.c
+++ b/src/utf8.c
@@ -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
diff --git a/src/utils.c b/src/utils.c
index 056c39b..76cdba6 100644
--- a/src/utils.c
+++ b/src/utils.c
@@ -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
diff --git a/src/vars.c b/src/vars.c
index ac6654c..a54b702 100644
--- a/src/vars.c
+++ b/src/vars.c
@@ -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
diff --git a/src/wins.c b/src/wins.c
index 0181ab9..e18edf0 100644
--- a/src/wins.c
+++ b/src/wins.c
@@ -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