From: Mark Wooding <mdw@distorted.org.uk>
Date: Sat, 21 Nov 2009 11:21:07 +0000 (+0000)
Subject: Merge branch 'master' of metalzone:etc/profile
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~mdw/git/profile/commitdiff_plain/aec3b793a4877cbf5aee98eaac0f9efbc70eae33?ds=inline

Merge branch 'master' of metalzone:etc/profile

* 'master' of metalzone:etc/profile:
  dot/emacs: Consolidate chunks of `add-hook' settings and similar.
  el/dot-emacs.el: Turn on `reveal-mode' because it wins.
  bin/mdw-editor: Use `emacsclient' to edit files.
  dot/emacs: Always start the servers in Emacs 23.
  dot/emacs: Set frame parameters unconditionally.
  el/dot-emacs.el: Add `indent' and `debug' declarations to macros.
  dot/emacs, el/dot-emacs.el: Fix font configuration.
  dot/gnus.el: Use fancy tree drawing if using window-system output.
  dot/xinitrc: Run Emacs with GDK_NATIVE_WINDOWS=1.
  dot/xinitrc: Search for Emacs 23, and prefer it over other Emacsen.

Conflicts:
	dot/emacs -- server startup differences
---

aec3b793a4877cbf5aee98eaac0f9efbc70eae33