Merge branch 'master' of git.distorted.org.uk:~mdw/publish/public-git/profile

* 'master' of git.distorted.org.uk:~mdw/publish/public-git/profile:
  dot/zshrc: Some other tweaks.
  dot/zshrc: Use `hist_ignore_space' instead of the `zshaddhistory' hack.
  dot/bashrc, dot/zshrc: Turn on `!' expansion explicitly.

diff --git a/Makefile b/Makefile
index af5dc13dbd3c8b0929df8a763350184376d353ef..4df8c56e5d7561aaaeafc0978df862db06395004 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -69,7 +69,8 @@ ifneq ($(EMACS),nil)
 EMACSLIB                = $(HOME)/lib/emacs
 
 EMACS_VERSION          := $(shell $(EMACS) 2>&1 -Q --batch --eval \
-       '(message "%s %s" emacs-major-version emacs-minor-version)')
+       '(message "%s %s" emacs-major-version emacs-minor-version)' | \
+       tail -n1)
 emacs-version-p                 = $(shell set -- $(EMACS_VERSION); \
        if [ $$1 -gt $1 ] || ([ $$1 -eq $1 ] && [ $$2 -ge $2 ]); then \
          echo t; \