Merge branch 'master' of git+ssh://metalzone.distorted.org.uk/~mdw/etc/profile

* 'master' of git+ssh://metalzone.distorted.org.uk/~mdw/etc/profile:
  dot/fonts.conf: Prevent finding of Fixed Normal.
  dot/mailrc: Parents changed email addresses again.
  bg/bsg-supper: Galactica backdrop of win.
  dot/emacs, el/dot-emacs.el: Fontification for Pyrex code.
  el/dot-emacs.el: Turn electric star and slash back on.
  dot/emacs: Put semantic's droppings somewhere central.
  e16-bindings: Move conservative-maximize bindings off S5.
  dot/e16-bindings: Make 5-F6 toggle keyboard mouse control.
  Go back to xscreensaver.  Mostly.

diff --cc dot/e16-bindings
Simple merge

diff --cc el/dot-emacs.el
Simple merge