Merge branch 'master' of git://github.com/alanpearce/dotfiles

Conflicts:
	install

Emacs: fix cask loading to follow official usage

Installer: create directories if not present

zsh: Fix path to FreeBSD configuration

Emacs: check and use cask, if installed

Installer: Create ~/projects/dotfiles if missing

Merge branch 'master' of server.home:dotfiles

Update pure prompt

Emacs: remove with-elapsed-timer call

Emacs: Simplify geiser-racket interaction

Change git push default tracking for backwards compatibility

Emacs: Enable and configure dired-omit-mode

zsh: Share history between terminal windows

Emacs: use coreutils' gls on OSX

Emacs: use server-side comments inside HTML

Emacs: Remove initial indentation of code inside script+style tags

zsh: Fix completion for git/hub

Emacs: disable automatic-pairing in web-mode

zsh: Ensure FreeBSD sources its own zsh configuration

Add Emacs daemon LaunchAgent file

Add OSX LaunchAgent installation

Emacs: remove defer keyword from all packages

Emacs: Fix mode specification for .zsh files

zsh: Don't fetch audit list when running update-check

zsh: Fix FreeBSD pkg UPDATING check

Emacs: Ensure .zsh files are opened as shell scripts

zsh: Add site-functions under /usr/local to fpath, if exists

Emacs: enable autopair-mode in yaml-mode

Emacs: enable yaml-mode for ansible (group|host)_vars files

zsh: Rename dangling reference to zshrc in installer

zsh: Separate startup files for different startup methods

zsh: Remove reference to gentoo configuration from installer

zsh: Remove unused file

zsh: Remove file for old work laptop

zsh: Remove file for gentoo

Emacs: Improve mouse/trackpad scrolling by only scrolling one line at a time

Emacs: Add a margin to ensure the next/previous line is always visible

zsh: Refactor magit and dired into functions

zsh: Remove title-changing precmd function

zsh: Remove check for cache directory; it's created by the installer

zsh: Recompile compdump file in dotfiles installer

zsh: rename auxillary files with extension

zsh: Add zsh-completions to fpath

Emacs: run diff-hl-update when magit refreshes a buffer

Emacs: use current frame when handling OSX open-file event

Emacs: load cc-mode on startup

Emacs: load tramp on startup

Emacs: eagerly load dired and dired+

zsh: Fix pure pull indicator showing when ahead of upstream

zsh: increase contrast of pure prompt character

Update pure prompt

zsh: Add alias for prettyping.sh

Emacs: Disable smart-tabs-mode in ruby-mode

zsh: Disable globbing for the salt command

Emacs: bind s-, to open emacs init file from register

Emacs: workaround issue setting variable-pitch fonts on OSX

zsh: Add alias to open the current directory in Emacs' dired

Emacs: add register for zshrc

zsh: Remove duplicate fasd e alias

Emacs: remove call to moz-minor-mode

Emacs: fix reference to missing font on OSX

Emacs: set a variable pitch font under darwin

Emacs: silence compiler warning about unused variable

Emacs: remove unnecessary lambda function

Emacs: remove commented-out code

Emacs: remove old-style indentation function

Emacs: ensure that org-journal is installed

Emacs: fix warning in project-persist configuration

Emacs: remove moz-repl mode

Add alias to launch magit in GUI emacs

Add ec and et commands to launch emacsclient in a terminal and GUI respectively

Emacs: improve font-setting on OSX when running as a daemon

Emacs: remove customisation of byte-compile-dest-file for init.el

Instead, rely on installer creating a symlink to ~/projects/dotfiles/init.elc

Git: fix path to global gitignore file

Emacs: switch to the Wordpress coding style in php-mode-hook

Remove unneeded canonicalisation from installer

Move dotfiles under ~/projects

Merge remote-tracking branch 'refs/remotes/origin/master'

Conflicts:
	emacs/init.el

Use git instead of mercurial for cloning dotfiles on new installations

Installer: ensure that the fasdrc is symlinked correctly

zsh: Enable current path lookup in fasd only when using the e alias

zsh: remove e alias; duplicate of fasd

Revert "Replace auto-compile-mode with auto-async-byte-compile"

This reverts commit a7d64a6e05aa450dda63f9b8b68e637471b223c5.

Emacs: don't insure that SLIME is installed

Emacs: Load multiple-cursors eagerly

Emacs: install and enable diff-hl-mode

Emacs: fix ido initialisation

Emacs: switch from helm-ibuffer to ibuffer

Emacs: set ido-mode to add recent files to the buffer list

Emacs: setup recentf-mode

Emacs: Set smex variables before calling smex-initialize

MinTTY: Switch fonts

Merge remote-tracking branch 'refs/remotes/origin/master'

Emacs: add emmet-mode to web-mode-hook

Setup emmet-mode

Emacs: Setup file associations for ruby mode

Add GNU Global tags files to global gitignore

zsh: Fix error when no gem-based programs are installed

zsh: Fix prompt issues with TRAMP

Change Emacs font rendering on X11

Add font configuration for OSX

Set the editor to emacsclient by default

zsh: Remove unused aticonfig alias

zsh: Refactor and improve cross-platform handling of ls options

zsh: Refactor OS checking to use just one variable

zsh: Remove gnu-only dircolors assignment

zsh: Use gls instead of ls if available

zsh: Refactor OS check and include OSX

zsh: Remove unused namecoin alias

zsh: Remove extra newline from pure prompt

Merge remote-tracking branch 'refs/remotes/origin/master'

zsh: Add more contrast between success and failure prompt colours

zsh: Make git branch name visible in pure prompt

zsh: Optimise pure prompt git checking

Urxvt: use bright colours without bold fonts

zsh: Add solarized dircolors (ansi-universal)

zsh: Install and use the pure prompt

Merge branch 'master' of server.home:dotfiles

Xbindkeys: run dmenu with cache settings

Emacs: unbind s-m

Emacs: add s-G magit keybinding like s-D

Emacs: Unbind more unhelpful Mac keybindings

Merge remote-tracking branch 'refs/remotes/origin/master'

Emacs: Switch control and command on OSX

Emacs: add extra keybinding for projectile-find-file

Emacs: unbind unhelpful s-n key

Emacs: Fix control key issue on OSX

Emacs: make right modifier keys on Mac inherit the configuration of their left counterparts

Emacs: setup puppet-mode

Installer: check for host-specific zshrc before trying to compile

Ignore .DS_Store system files

Merge branch 'master' of home:dotfiles

Emacs: allow the option key to be used without inputting special characters

Emacs: make right modifier keys consistent with their left counterparts on OS X

Emacs: switch control and command keys

Emacs: install and configure org-journal

Emacs: setup slime with the quicklisp-slime-helper

Emacs: delay loading redshank until needed

Emacs: delay loading eldoc until needed

Emacs: delay loading quickrun until needed

Emacs: delay loading skewer until needed

Emacs: remove redundant :defer specifications

Emacs: globally highlight matching parentheses

Emacs: migrate expressions from ap/lisp-setup to lisp-common-mode-hook where possible

Emacs: add lisp-common-mode-hook to allow cleaner setup of Lisp modes

Emacs: disable CEDET configuration until I figure out how to update it again

Emacs: Bind shift+space to set the mark

Emacs: Improve X11 clipboard interoperability

Emacs: add function and keybinding for opening eshell in the current directory

Emacs: add keyboard binding for switching to eshell

Emacs: make helm update the candidate selection window more quickly

Emacs: install multi-term if it is not available

Emacs: enable auto-indent-mode in lisps and set its indent level to 2

Emacs: use *init-file* to track the location of init.el through symlinks

Emacs: make company overlay display more quickly

Installer: Fix relative paths

Installer: Fix FreeBSD detection

Installer: Fix directory stack popping too early

Emacs: rename deprecated org-alphabetical-lists variable

Emacs: fix bad diff again

Emacs: fix incorrect package name for js2-mode

Emacs: fix bad diff

Emacs: install and skewer-mode and hook into js2-mode

Emacs: replace js3-mode with js2-mode

Emacs: change goto-last-change binding to C-x <space> to avoid conflicting with pop-global-mark

Emacs: add register bindings for emacs init file and organiser.org

Emacs: add command to insert a formatted date

Emacs: move calendar setup to new ‘Dates & Times’ section

Emacs: use em-smart package to return to previous command in eshell sessions

Emacs: make shell-execute work when buffer is not visiting a file

Emacs: always disable C-z

Emacs: add use-package declarations to Imenu when in elisp

Emacs: turn on ido-mode instead of toggling

Emacs: setup javascript indentation rules

Emacs: fix typo in javascript setup

Emacs: only enable moz-minor-mode in javascript if loaded

Emacs: bind d in mu4e headers to mark for delete instead of for trash

Emacs: Add localhost to the list of TRAMP remotes which should not be proxied

Emacs: Don't call redshank-mode if redshank is not loaded

zsh: move smart_sudo alias from s to su to allow fasd to use s

Byte-compile all the emacs files

Emacs: delete obsolete package-install.el

Emacs: add redshank-mode and install into lisp hooks

Emacs: remove unused web-vcs

Emacs: set package-archives whilst compiling for bootstrapping awesomeness

Make fasd function executable

Fix typo in install

Emacs: download package lists if nonexistant to ease bootstrapping

Use post-merge hook instead of post-checkout

Migrate post-checkout hook code to install and run install from post-checkout hook

Migrate zsh file compilation to post-checkout hook

Add git hooks to recompile emacs init file and elisp directory

Emacs: enable init.el to be batch byte-compiled

Emacs: make JIT fontification faster

Emacs: remove eldoc-context

Emacs: remove workaround for compile errors from diminish

Emacs: add official org-mode package repository

Emacs: remove unmaintained tromey ELPA repository

Xbindkeys: Remove binding for xbindkeys_show

zsh: use 32-bit wine by default

Emacs: install quickrun-mode

Emacs: add autoload for mu4e

Emacs: remove unnecessary :idle forms

Emacs: only delete a frame when calling exit-emacs in a daemon

Emacs: ensure that lua-mode and haskell-mode are installed before use

Emacs: add setup for nginx-mode

Emacs: remove help+

Emacs: show fringes

Emacs: use :ensure to download packages when needed

Emacs: bind q in mu4e's main window to bury the buffer rather than quitting

Emacs: set mu4e to update its index every 5 minutes

Emacs: Remove electrify-return-if-match and replace with paredit keybindings in lisp-modes

Emacs: disable nxhtml-mode

Emacs: enable nxhtml on laptop rather than at work

DWM: make ediff windows float

Emacs: replace string-matches on system name with env/* comparisons

Emacs: whitespace fixes

Emacs: remove unnecessary :commands

Emacs: correctly start winner-mode

Emacs: remove setup of unused package color-theme-solarized

Emacs: remove unused variable

Emacs: fix typo in docstring

Emacs: merge `setq` forms

Emacs: whitespace fixes

Emacs: create systems for getting system location (i.e. work/home) and type (laptop/desktop/server)

Emacs: only run nxhtml at work

Emacs: disable nxhtml-menu-mode properly

Emacs: fix typo in org-mode bindings

Emacs: set org-mode to indent headings

Emacs: fix org-mode package reference

Emacs: Remove load-path hints which point to el-get

Emacs: load nxhtml from .emacs.d

Emacs: Check basic-packages list and install any missing packages

Emacs: Remove el-get in favour of package.el

Emacs: switch org-mode font back to fixed-pitch

Emacs: remove unused variable

Emacs: use lexical binding

Emacs: install and use company-mode

XResources: use ChromeOS fonts

Xresources: Fix colour ordering in solarized-light

Emacs: add SMTP submission port

Emacs: move mumamo workaround into nxhtml's use-package form

Emacs: fix typo in mumamo workaround

zsh: remove compinit warnings for root

Install: move dwm target directory under projects/

Emacs: Add lua-mode initial configuration

Emacs: delete-current-buffer-file should use vc-delete-file when appropriate

Emacs: rename-current-buffer-file should use vc-rename-file when appropriate

Emacs: add full host-name for comparison when determining whether to load mu4e configuration

Emacs: Improve add-subdirs-to-load-path by adding the directory itself to load path

Emacs: only setup mu4e on prefect, where mail is in the expected directories

Emacs: fix logic error in setting up load-path

Git: remove purr alias; rebasing is confusing

Git: Add my name.

zsh: New version of wprop alias to make class and instance names clearer

Emacs: setup mu4e

Git: initial configuration

Emacs: choose magit extensions based upon git configuration

Emacs: workaround mumamo buffer-local-vars warnings

Emacs: Add el-get-dir to load-path

Migrate repository from mercurial without history

Initial commit

zsh: check for gem directory and add bin folder to path if found

Emacs: improve configuration of common-lisp mode

Emacs: add eval-and-replace and bind to C-c e

zshrc: add X11 window role to wprop alias

Make shell-execute work with a universal prefix argument

Emacs: ensure org-mode package with contrib/ is installed

Emacs: fix compilation warning regarding eshell/cd

Emacs: load custom file

Emacs: don't initialise *init-file* when user-init-file is not set

Emacs: setup jinja2-mode

Git: use the patience diff algorithm

Setup ediff configuration

Emacs: Provide ap-functions in ap-functions.el

Add global gitignore file

Emacs: initialise smex on startup for faster usage

Emacs: setup web-mode

Merge remote-tracking branch 'refs/remotes/origin/master'

Emacs: save ido state file in emacs directory

Make installer create .zsh and .zsh/cache, if necessary

Merge branch 'master' of home:dotfiles

Emacs: Remove configuration for nxhtml mode

Emacs: rebind M-/ to hippie-expand

Emacs: set company completion to only happen after inserting text

Emacs: add s-G magit keybinding like s-D

Emacs: Unbind more unhelpful Mac keybindings

Emacs: Switch control and command on OSX

Emacs: add extra keybinding for projectile-find-file

Emacs: unbind unhelpful s-n key

Emacs: Fix control key issue on OSX

Emacs: Remove unnecessary eval-and-compile

Replace auto-compile-mode with auto-async-byte-compile

Emacs: disable ido-virtual-buffers due to issues with flx-ido

Emacs: Enable flx in ido

Emacs: Switch back to auto-compile from auto-async-byte-compile

Update FreeBSD update-check: portaudit -> pkg audit

Replace ido customisations for vertical candidate display with ido-vertical-mode

Switch default push tracking mode to current

Add envrc files to global gitignore

Add direnv

Add Brewfile with basic tools

Emacs: remove use-package ensure directives in favour of cask

Installer: create directories for links if needed