From: Mark Wooding <mdw@distorted.org.uk>
Date: Fri, 15 Jan 2016 22:43:53 +0000 (+0000)
Subject: Merge branch 'master' of git.distorted.org.uk:~mdw/publish/public-git/profile
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~mdw/git/profile/commitdiff_plain/200cf428d8a550f520123f7d3bcb0a17f76e3472?hp=a1e4004ca8710d6868f137f019f1625e1b00c15c

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

* 'master' of git.distorted.org.uk:~mdw/publish/public-git/profile:
  bin/mdw-build: Add a `native' option.
  bin/mdw-build: Allow configuration of the `setup' command.
  bin/mdw-build: `nocommit' isn't a special case.
  git/attributes: Don't put tabs in TeX files.
  dot/e16-bindings: Set cursor shape; repaint display.
---

diff --git a/bin/mdw-build b/bin/mdw-build
index 9717a20..9eb466b 100755
--- a/bin/mdw-build
+++ b/bin/mdw-build
@@ -64,12 +64,13 @@ Build options:
 
   [no]checkout[=REV]
   [no]release
-  [no]setup
+  [no]setup[=RUNE]
   [no]distcheck
   [no]debian
   [no]upload
   [no]clean
   [no]vpath
+  [no]native
 EOF
 }
 
@@ -89,23 +90,27 @@ checkout=yes
 checkoutrev=HEAD
 build=test
 setup=yes
+setupcmd=mdw-setup
 distcheck=yes
 debian=yes
 upload=yes
 clean=yes
 vpath=yes
+native=yes
 for opt; do
   case "$opt" in
     checkout)	checkout=yes checkoutrev=HEAD ;;
     checkout=*) checkout=yes checkoutrev=${opt#*=} ;;
-    nocheckout) checkout=no ;;
     release)	build=release ;;
     norelease)	build=test ;;
+    setup)	setup=yes setupcmd=mdw-setup ;;
+    setup=*)	setup=yes setupcmd=${opt#*=} ;;
 
-    setup | distcheck | debian | upload | clean | vpath)
+    distcheck | debian | upload | clean | vpath | native)
       eval "$opt=yes"
       ;;
-    nosetup | nodistcheck | nodebian | noupload | noclean | novpath)
+    nocheckout | nosetup | nodistcheck | nodebian | \
+    noupload | noclean | novpath | nonative)
       eval "${opt#no}=no"
       ;;
     *)
@@ -263,7 +268,7 @@ esac
 ## Maybe refresh the build machinery.
 case "$setup" in
   yes)
-    run mdw-setup
+    run $setupcmd
     ;;
 esac
 
@@ -310,9 +315,14 @@ esac
 
 cd $releasepath
 
-if ! tar tf $buildpath/$distdir.tar.gz 2>/dev/null | grep -q RELEASE; then
-  fail "missing RELEASE file in distribution"
-fi
+case $native in
+  yes)
+    if ! tar tf $buildpath/$distdir.tar.gz 2>/dev/null | grep -q RELEASE
+    then
+      fail "missing RELEASE file in distribution"
+    fi
+    ;;
+esac
 
 run mv $buildpath/$distdir.tar.gz .
 case $build in
diff --git a/dot/e16-bindings b/dot/e16-bindings
index ebb44ce..4252cb7 100644
--- a/dot/e16-bindings
+++ b/dot/e16-bindings
@@ -40,11 +40,13 @@ KeyDown    5      Tab focus next
 KeyDown    5     plus desk next
 KeyDown    5    minus desk prev
 KeyDown   C5        a desk arrange
+KeyDown   C5        c exec xsetroot -cursor_name left_ptr
 KeyDown   C5        f wop * fullscreen
 KeyDown   C5        g magwin show
 KeyDown   C5        h wop * tw available
 KeyDown   C5        i wop * iconify
 KeyDown   C5        k wop * kill
+KeyDown	  C5	    l exec xrepaint -a
 KeyDown   C5        m wop * ts available
 KeyDown   C5        r wop * shade
 KeyDown   C5        s wop * stick
diff --git a/git/attributes b/git/attributes
index 858068d..0738f57 100644
--- a/git/attributes
+++ b/git/attributes
@@ -5,3 +5,4 @@
 *.lisp		diff=lisp
 
 *.py		whitespace=trailing-space,space-before-tab,tab-in-indent
+*.tex		whitespace=trailing-space,space-before-tab,tab-in-indent