Merge branch 'master' of git+ssh://ponder.ncipher.com/~mwooding/etc/profile
authorMark Wooding <mdw@distorted.org.uk>
Wed, 6 Feb 2008 17:01:30 +0000 (17:01 +0000)
committerMark Wooding <mdw@distorted.org.uk>
Wed, 6 Feb 2008 17:01:30 +0000 (17:01 +0000)
commit374edd691ce1a7fd2462aa249d2a1ef4c2c9ddd2
tree65d4dfd8ee6328476dc18a2193ae9670697570a5
parent1231f13231862430d554ae05d209a121c4ef8518
parent85bbf8d3d51ef892f4707fcbd6ffc841818175d1
Merge branch 'master' of git+ssh://ponder.ncipher.com/~mwooding/etc/profile

* 'master' of git+ssh://ponder.ncipher.com/~mwooding/etc/profile:
  xinitrc: Support Emacs 22.
  bash_profile: Select Emacs 22 by preference.
  dot-emacs: Make `trap' report the erroneous code.
  emacs, dot-emacs: Overhaul for Emacs22 compatibility.