master updated (074cdea573e -> 556b803339d)

eliz pushed a change to branch master.

      from  074cdea573e timeclock: Optionally use 24-hour clock
       new  0c83d2cdbb1 Fix 'current-active-maps' for 4-element position list
       new  556b803339d ; Fix last change


Summary of changes:
 lisp/emacs-lisp/byte-opt.el |  2 +-
 lisp/subr.el                | 13 -------------
 src/keyboard.c              | 24 ++++++++++++++++++++++++
 src/keymap.c                |  3 ++-
 test/src/keyboard-tests.el  | 15 +++++++++++++++
 5 files changed, 42 insertions(+), 15 deletions(-)