From: Mark Wooding <mdw@distorted.org.uk>
Date: Mon, 31 Dec 2012 05:32:58 +0000 (+0000)
Subject: Merge branch 'master' of git.distorted.org.uk:~mdw/public-git/profile
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~mdw/git/profile/commitdiff_plain/8a152a79984a99e98919ca2c7fcf7f2cf6c8c9f1?ds=inline;hp=-c

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

* 'master' of git.distorted.org.uk:~mdw/public-git/profile:
  el/dot-emacs.el: Respect `indent-tabs-mode' when computing fill prefix.
  el/dot-emacs.el: Use #'FOO rather than (function FOO).
  dot/emacs: Use `makefile-mode' for *.make files.
---

8a152a79984a99e98919ca2c7fcf7f2cf6c8c9f1
diff --combined dot/emacs
index ceef414,b35e95f..20daa9b
--- a/dot/emacs
+++ b/dot/emacs
@@@ -514,6 -514,7 +514,7 @@@
  		("\\.cs$" . csharp-mode)
  		("\\.go$" . go-mode)
  		("\\.org$" . org-mode)
+ 		("\\.make$" . makefile-mode)
  		;; ("/[ch]/" . c-mode)
  		(,(concat "/\\("
  			  "\\.stgit\\.msg" "\\|"
@@@ -550,9 -551,7 +551,9 @@@
  		("@PYTHON@" . python-mode)
  		("@PERL@" . perl-mode)
  		("@TCLSH@" . tcl-mode)
 -		("@WISH@" . tcl-mode))
 +		("@WISH@" . tcl-mode)
 +		("/tclsh" . tcl-mode)
 +		("/wish" . tcl-mode))
  	      interpreter-mode-alist))
  
  (setq completion-ignored-extensions