Merge branch 'master' of git+ssh://metalzone.distorted.org.uk/~mdw/etc/profile

* 'master' of git+ssh://metalzone.distorted.org.uk/~mdw/etc/profile:
  dot/fonts.conf: Prevent finding of Fixed Normal.
  dot/mailrc: Parents changed email addresses again.
  bg/bsg-supper: Galactica backdrop of win.
  dot/emacs, el/dot-emacs.el: Fontification for Pyrex code.
  el/dot-emacs.el: Turn electric star and slash back on.
  dot/emacs: Put semantic's droppings somewhere central.
  e16-bindings: Move conservative-maximize bindings off S5.
  dot/e16-bindings: Make 5-F6 toggle keyboard mouse control.
  Go back to xscreensaver.  Mostly.

diff --git a/bg/bsg-supper.jpg b/bg/bsg-supper.jpg
new file mode 100644 (file)
index 0000000..f021890
Binary files /dev/null and b/bg/bsg-supper.jpg differ

diff --git a/bin/lock-screen b/bin/lock-screen
new file mode 100755 (executable)
index 0000000..5401260
--- /dev/null
+++ b/bin/lock-screen
@@ -0,0 +1,25 @@
+#! /bin/sh
+
+set -e
+
+win=no
+
+## xscreensaver
+if xscreensaver-command -version >/dev/null 2>&1; then
+  xscreensaver-command -lock
+  win=yes
+fi
+
+## gnome-screensaver
+if gnome-screensaver-command --query >/dev/null 2>&1; then
+  gnome-screensaver-command --lock
+  win=yes
+fi
+
+## Make sure we did something useful.
+case $win in
+  no)
+    echo >&2 "$0: no screensaver found"
+    exit 1
+    ;;
+esac

diff --git a/dot/e16-bindings b/dot/e16-bindings
index 143ae4392f1242c3421140877929c9f2aea7318a..c2cf4be2b2aca9707270c518494d6f61cdb424eb 100644 (file)
--- a/dot/e16-bindings
+++ b/dot/e16-bindings
@@ -29,11 +29,12 @@ Tooltip Go Back a Desktop
 MouseDown      * 5 desk next
 Tooltip Go Forward a Desktop
 Aclass KEYBINDINGS global
+KeyDown    5       F6 exec gconftool --toggle /desktop/gnome/accessibility/keyboard/mousekeys_enable
 KeyDown    5       F7 exec un-backslashify-selection
 KeyDown    5       F8 exec xatom set XINIT_COMMAND :terminal
 KeyDown    5       F9 exec xatom set XINIT_COMMAND :ask-run
 KeyDown           5      F10 exec xatom set XINIT_COMMAND :ask-command
-KeyDown           5      F11 exec gnome-screensaver-command --lock
+KeyDown           5      F11 exec lock-screen
 KeyDown    5      F12 exec xshutdown
 KeyDown    5      Tab focus next
 KeyDown    5     plus desk next
@@ -57,9 +58,9 @@ KeyDown   C5       F4 menus show windowlist
 KeyDown   C5       Up wop * raise
 KeyDown   C5     Down wop * lower
 KeyDown   C5      End exit restart
-KeyDown   S5        h wop * tw conservative
-KeyDown   S5        m wop * ts conservative 
-KeyDown   S5        v wop * th conservative
+KeyDown   SC5       h wop * tw conservative
+KeyDown   SC5       m wop * ts conservative
+KeyDown   SC5       v wop * th conservative
 KeyDown   S5       Up area move 0 -1
 KeyDown   S5     Down area move 0 1
 KeyDown   S5     Left area move -1 0

diff --git a/dot/emacs b/dot/emacs
index 211879050c9fc4e1714029c564b8a92ec802b226..fe5b563333e847c561f2288702411ef1d7b76e96 100644 (file)
--- a/dot/emacs
+++ b/dot/emacs
@@ -62,6 +62,7 @@
 (trap (or mdw-fast-startup (require 'tex-site)))
 
 (trap (or mdw-fast-startup (semantic-load-enable-minimum-features)))
+(setq semanticdb-default-save-directory "~/.emacs.d/semanticdb/")
 
 ;; Skeleton stuff.
 
@@ -483,7 +484,8 @@
 (mapcar (lambda (hook) (add-hook hook 'mdw-misc-mode-config))
        '(c-mode-hook c++-mode-hook objc-mode-hook java-mode-hook
          csharp-mode-hook perl-mode-hook cperl-mode-hook
-         python-mode-hook icon-mode-hook awk-mode-hook tcl-mode-hook
+         python-mode-hook pyrec-mode-hook icon-mode-hook awk-mode-hook
+         tcl-mode-hook
          asm-mode-hook TeX-mode-hook LaTeX-mode-hook
          TeXinfo-mode-hook tex-mode-hook latex-mode-hook
          texinfo-mode-hook emacs-lisp-mode-hook scheme-mode-hook
@@ -573,6 +575,7 @@
 
 (setq-default py-indent-offset 2)
 (add-hook 'python-mode-hook 'mdw-fontify-python t)
+(add-hook 'pyrex-mode-hook 'mdw-fontify-pyrex t)
 (setq py-python-command-args `("-i" "-colors" ,(if mdw-black-background
                                                   "Linux"
                                                 "LightBG")))

diff --git a/dot/fonts.conf b/dot/fonts.conf
index c7504cf33a767079f0f12a718f018fe6953d4936..b73829511b15719ace3c1542a456e3a7aa210da5 100644 (file)
--- a/dot/fonts.conf
+++ b/dot/fonts.conf
@@ -26,6 +26,7 @@
   <match target="pattern">
     <test name="family"><string>MiscFixed6x13</string></test>
     <!-- edit name="size"><double>12</double></edit -->
+    <edit name="style"><string>SemiCondensed</string></edit>
     <edit name="width"><int>87</int></edit>
     <edit name="family"><string>Fixed</string></edit>
     <edit name="foundry"><string>Misc</string></edit>

diff --git a/dot/mailrc b/dot/mailrc
index a382e058be56852493cad5535bf12fa19bc8a212..edc41d5c5d8bb0a0965b237c84f2f553666d001b 100644 (file)
--- a/dot/mailrc
+++ b/dot/mailrc
@@ -4,9 +4,9 @@ set EDITOR=ed
 unset hold askcc askbcc autoprint save
 retain From To Cc Bcc Subject Return-Path Delivered-To Date
 # alias clive clive@dgw.co.uk
-alias dad binswood@bigfoot.com
-#alias mum swbinswood@bigfoot.com
-alias mum s.wooding@talktalk.net
+alias dad binswood@googlemail.com
+alias mum swbinswood@googlemail.com
+##alias mum s.wooding@talktalk.net
 alias home mdw@distorted.org.uk
 alias work mwooding@ncipher.com
 alias spam spam@distorted.org.uk

diff --git a/dot/xinitrc b/dot/xinitrc
index 7543e1522062a1902a3575aa1ac7797933f0558f..a0722c5588c0d32bdbe7d65dbb2e3bb1a8501978 100755 (executable)
--- a/dot/xinitrc
+++ b/dot/xinitrc
@@ -125,6 +125,14 @@ start-clients () {
   ## System monitor.
   case $vnc in no) run bginit gkrellm ;; esac
 
+  ## Screensaver.
+  case $vnc in
+    no)
+      run init xscreensaver-command -exit
+      run bginit xscreensaver -no-splash
+      ;;
+  esac
+
   ## Panel.
   case $vnc in no) run bginit gnome-panel ;; esac
 

diff --git a/el/dot-emacs.el b/el/dot-emacs.el
index f7cadd9831904cb668cae01ac494bb5903a5660f..132278963823441ea4fa2731798fd9cf6474401e 100644 (file)
--- a/el/dot-emacs.el
+++ b/el/dot-emacs.el
@@ -822,11 +822,6 @@ (defun linux-c-mode ()
 
 ;; Make C indentation nice.
 
-(eval-after-load "cc-mode"
-  '(progn
-     (define-key c-mode-map "*" nil)
-     (define-key c-mode-map "/" nil)))
-
 (defun mdw-c-lineup-arglist (langelem)
   "Hack for DWIMmery in c-lineup-arglist."
   (if (save-excursion
@@ -1355,37 +1350,48 @@ (defun perl-number-tests (&optional arg)
 ;;;--------------------------------------------------------------------------
 ;;; Python programming style.
 
-;; Define Python fontification style.
-
-(defun mdw-fontify-python ()
+(defun mdw-fontify-pythonic (keywords)
 
   ;; Miscellaneous fiddling.
   (mdw-standard-fill-prefix "\\([ \t]*#+[ \t]*\\)")
 
   ;; Now define fontification things.
   (make-local-variable 'font-lock-keywords)
-  (let ((python-keywords
-        (mdw-regexps "and" "as" "assert" "break" "class" "continue" "def"
-                     "del" "elif" "else" "except" "exec" "finally" "for"
-                     "from" "global" "if" "import" "in" "is" "lambda"
-                     "not" "or" "pass" "print" "raise" "return" "try"
-                     "while" "with" "yield")))
-    (setq font-lock-keywords
-         (list
+  (setq font-lock-keywords
+       (list
 
-          ;; Set up the keywords defined above.
-          (list (concat "\\<\\(" python-keywords "\\)\\>")
-                '(0 font-lock-keyword-face))
+        ;; Set up the keywords defined above.
+        (list (concat "\\<\\(" python-keywords "\\)\\>")
+              '(0 font-lock-keyword-face))
 
-          ;; At least numbers are simpler than C.
-          (list (concat "\\<0\\([xX][0-9a-fA-F_]+\\|[0-7_]+\\)\\|"
-                        "\\<[0-9][0-9_]*\\(\\.[0-9_]*\\|\\)"
-                        "\\([eE]\\([-+]\\|\\)[0-9_]+\\|[lL]\\|\\)")
-                '(0 mdw-number-face))
+        ;; At least numbers are simpler than C.
+        (list (concat "\\<0\\([xX][0-9a-fA-F_]+\\|[0-7_]+\\)\\|"
+                      "\\<[0-9][0-9_]*\\(\\.[0-9_]*\\|\\)"
+                      "\\([eE]\\([-+]\\|\\)[0-9_]+\\|[lL]\\|\\)")
+              '(0 mdw-number-face))
 
-          ;; And anything else is punctuation.
-          (list "\\(\\s.\\|\\s(\\|\\s)\\|\\s\\\\|\\s/\\)"
-                '(0 mdw-punct-face))))))
+        ;; And anything else is punctuation.
+        (list "\\(\\s.\\|\\s(\\|\\s)\\|\\s\\\\|\\s/\\)"
+              '(0 mdw-punct-face)))))
+
+;; Define Python fontification styles.
+
+(defun mdw-fontify-python ()
+  (mdw-fontify-pythonic
+   (mdw-regexps "and" "as" "assert" "break" "class" "continue" "def"
+               "del" "elif" "else" "except" "exec" "finally" "for"
+               "from" "global" "if" "import" "in" "is" "lambda"
+               "not" "or" "pass" "print" "raise" "return" "try"
+               "while" "with" "yield")))
+
+(defun mdw-fontify-pyrex ()
+  (mdw-fontify-pythonic
+   (mdw-regexps "and" "as" "assert" "break" "cdef" "class" "continue"
+               "ctypedef" "def" "del" "elif" "else" "except" "exec"
+               "extern" "finally" "for" "from" "global" "if"
+               "import" "in" "is" "lambda" "not" "or" "pass" "print"
+               "raise" "return" "struct" "try" "while" "with"
+               "yield")))
 
 ;;;--------------------------------------------------------------------------
 ;;; Icon programming style.

diff --git a/setup b/setup
index 7174162701ede1e12a0ba418743e22520dec3848..1bc13f74f582115fc15ed2c8b4f452a6eb2df92f 100755 (executable)
--- a/setup
+++ b/setup
@@ -171,6 +171,7 @@ echo "      all done."
 backgrounds="
   jue-peek.jpg
   medusa.jpg
+  bsg-supper.jpg
   rayne.jpg
   hypatia.jpg
   noodly.jpg"
@@ -220,6 +221,7 @@ scripts="
 [ "$xstuff" ] && scripts="$scripts
   xinitcmd
   un-backslashify-selection
+  lock-screen
   xshutdown"
 echo "Installing scripts..."
 mkdir -p $HOME$sub/bin