Recently, the macintosh "us" keymap got broken, modifiers no longer work. The
macintosh "fr" keymap that I hacked a while ago still works (they are very
different).

The breakage is that I get no modifiers at all. Looking at the keymap, I can see
that all the modifiers definitions are indeed commented out. I don't know if the
keymap did that because it expects them to be defined by one of the included
files or whatever, but the end result is that they are gone. Uncommenting them
seem to fix them.

I'd like some XKB experts to review those keymaps and give me they point of
view. The "fr" one is a bit ugly because I had to play funny tricks to get some
of the special Mac key combos to work, but it seems to still be functional. The
"us" one should be more simple.