I've spent my entire day at work merging compiler changes into the main tree. Oh what fun. Merging changes into files which are semi-autogenerated by a mystical merging process is not fun.

So, I have learned to use xemacs's ediff, and it is good. Much easier than eyeballing diffs, nice highlighting of the different regions in question (and indeed sub-regions and stuff), single key to move the version in one file with the other, etc. It's great! And, as with all emacs, I can spend my entire life learning the rest of the functions and keybindings.

Also discovered an emacs function for generating nice pretty-printed HTML from syntax-highlighted buffers. Will definitely find a use for this in the future :)

Oh, I intend to write more technical stuff here, and resume development on the (somewhat icky) codebase. Started looking at re-writing, perhaps in a different language (functional), will write about this as I go along.