Merge branch 'maint'

2013-02-04 20:11:58 +01:00
parent 308ba7c983 a7944d335e
commit b30ccc6319
49 changed files with 81 additions and 63 deletions
--- 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
--- 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);
--- 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)
--- 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
--- 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
--- 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
--- 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;
--- 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
--- 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
--- 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
--- 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
--- 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"
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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