dot/emacs: Add auto-mode magic for Sage.

[profile] / Makefile

diff --git a/Makefile b/Makefile
index af5dc13dbd3c8b0929df8a763350184376d353ef..e1abd268592cb1fd31eb0106b2f208d3a0fa79d8 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -33,7 +33,7 @@ relax                  =
 ### Configuration.
 
 ## Figure out where I am.
-HERE                    = $(shell pwd)
+HERE                   := $(shell pwd)
 
 ## Decide on how to fetch things from URLs.
 ifeq ($(shell (curl >/dev/null 2>&1 --version || [ $$? -eq 2 ]) && echo t),t)
@@ -46,8 +46,9 @@ endif
 EMACS                  := $(shell \
        emacs=nil; \
        for i in emacs24 emacs23 emacs22 emacs21 emacs; do \
-         if type >/dev/null 2>&1 $$i; then echo $$i; break; fi; \
-       done)
+         if type >/dev/null 2>&1 $$i; then emacs=$$i; break; fi; \
+       done; \
+       echo $$emacs)
 
 ## Whence to obtain externally hosted stuff.
 REPO                    = https://ftp.distorted.org.uk/u/mdw/profile
@@ -69,7 +70,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; \
@@ -279,6 +281,8 @@ SCRIPTLINKS         += xinitcmd lock-screen xshutdown
 SCRIPTLINKS            += un-backslashify-selection
 SCRIPTLINKS            += xpra-start-xdummy
 SCRIPTLINKS            += play-rawk
+SCRIPTLINKS            += media-keys
+SCRIPTLINKS            += disorder-notify
 
 DOTCPP                 += .Xdefaults
 Xdefaults_DEFS          = -DEMACSWD=$(call mdw-conf,emacs-width,77)