From: Mark Wooding Date: Wed, 6 Feb 2008 17:01:30 +0000 (+0000) Subject: Merge branch 'master' of git+ssh://ponder.ncipher.com/~mwooding/etc/profile X-Git-Url: https://git.distorted.org.uk/~mdw/profile/commitdiff_plain/374edd691ce1a7fd2462aa249d2a1ef4c2c9ddd2?hp=-c 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. --- 374edd691ce1a7fd2462aa249d2a1ef4c2c9ddd2