master
Fix objdir != srcdir, as well as make distcheck. Don't attempt to create Compose.pre files; formatting fixes. Added if not already present.
Use newer callback-based API for XIM.
Strip trailing whitespace from source files