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: Apply reStructuredText face settings after load.

diff --git a/dot/emacs b/dot/emacs
index fe2f7be91cacb78d6ad0685155f7e98efc482688..1a6985852866510eca0b991f9484996d6a76e9b8 100644 (file)
--- a/dot/emacs
+++ b/dot/emacs
@@ -59,6 +59,8 @@
      (not (memq 'git vc-handled-backends))
      (setq vc-handled-backends (cons 'GIT vc-handled-backends)))
 
+(setq magit-log-cutoff-length 512)
+
 (trap (or mdw-fast-startup (require 'p4)))
 
 (trap (or mdw-fast-startup (require 'tex-site)))
@@ -544,6 +546,7 @@
 
 (setq interpreter-mode-alist
       (append `(("runlisp" . lisp-mode)
+               ("@BASH" . sh-mode)
                ("@PYTHON@" . python-mode)
                ("@PERL@" . perl-mode)
                ("@TCLSH@" . tcl-mode)

diff --git a/dot/xinitrc b/dot/xinitrc
index 8fce589db011b56d1213649c07b13c3b44b79d24..9875cadf7240a9dcb1a63667ef22e6d219699263 100755 (executable)
--- a/dot/xinitrc
+++ b/dot/xinitrc
@@ -99,7 +99,10 @@ initialize () {
   run init xset m 2 1
 
   ## Key mappings.
-  xmodmap -e 'keysym BackSpace = BackSpace BackSpace'
+  xmodmap $HOME/.xmodmap
+  if [ -r $HOME/.xmodmap-local ]; then
+    xmodmap $HOME/.xmodmap-local
+  fi
 }
 
 ###--------------------------------------------------------------------------

diff --git a/dot/xmodmap b/dot/xmodmap
new file mode 100644 (file)
index 0000000..49be358
--- /dev/null
+++ b/dot/xmodmap
@@ -0,0 +1,4 @@
+!!! -*-conf-*-
+
+!! Remove the binding of the backspace key to Terminate_Server.
+keysym BackSpace = BackSpace BackSpace

diff --git a/setup b/setup
index f84d7998963e13cc2e22959af1abd343cf44f3e0..82898ef137ef73eeafd598b92589e0dc640122c1 100755 (executable)
--- a/setup
+++ b/setup
@@ -152,7 +152,7 @@ dotfiles="
   w3m-config:.w3m/config elinks.conf:.elinks/elinks.conf
   dircolors colordiffrc screenrc cvsrc indent.pro"
 [ "$xstuff" ] && dotfiles="$dotfiles
-  xinitrc xsession Xdefaults vncrc vncsession
+  xinitrc xsession xmodmap Xdefaults vncrc vncsession
   fonts.conf
   stalonetrayrc
   putty-defaults:.putty/sessions/Default%20Settings