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

* 'master' of http://git.distorted.org.uk/~mdw/profile:
  dot/vimrc: Fix obvious bogosity.
  el/mdw-multiple-cursors.el: Make RET work like <enter>.
  Support for Magnar Sveen's awesome `multiple-cursors' package.
  dot/emacs: Move `remember' to C-c o r.
  dot/bash_profile: Set the `less' focus line further down the window.
  el/dot-emacs.el: Mark some magic C constants separately.
  dot/muttrc: Fix attribution line.
  dot/muttrc: New configuration files for Mutt.

diff --combined el/dot-emacs.el
index 2c5fa5340e60712c074fc2e42309f9afcbf070b1,f21af7f06790f2007f59d5b2ecde7adc11f66b91..a3accbc100f155739ac75eb2eb62d85ebec5b670
--- 1/el/dot-emacs.el
--- 2/el/dot-emacs.el
+++ b/el/dot-emacs.el
@@@ -865,6 -865,9 +865,9 @@@ doesn't match any of the regular expres
    (((type tty) (class color)) :background "blue")
    (((type tty) (class mono)) :inverse-video t)
    (t :background "grey30"))
+ (mdw-define-face mc/cursor-face
+   (((type tty) (class mono)) :inverse-video t)
+   (t :background "red"))
  (mdw-define-face minibuffer-prompt
    (t :weight bold))
  (mdw-define-face mode-line
@@@ -1197,7 -1200,6 +1200,6 @@@
                      "explicit"        ;C++
                      "export"          ;C++
                      "extern"          ;K&R, C89
-                     "false"           ;C++, C9X macro
                      "float"           ;K&R, C89
                      "for"             ;K&R, C89
                      ;; "fortran"      ;K&R
@@@ -1229,9 -1231,7 +1231,7 @@@
                      "struct"           ;K&R, C89
                      "switch"           ;K&R, C89
                      "template"         ;C++
-                     "this"             ;C++
                      "throw"            ;C++
-                     "true"             ;C++, C9X macro
                      "try"              ;C++
                      "this"             ;C++
                      "typedef"          ;C89
@@@ -1266,6 -1266,11 +1266,11 @@@
                      "__typeof__"       ;GCC
                      "__volatile__"     ;GCC
                      ))
+       (c-constants
+        (mdw-regexps "false"           ;C++, C9X macro
+                     "this"             ;C++
+                     "true"             ;C++, C9X macro
+                     ))
        (preprocessor-keywords
         (mdw-regexps "assert" "define" "elif" "else" "endif" "error"
                      "ident" "if" "ifdef" "ifndef" "import" "include"
@@@ -1297,6 -1302,9 +1302,9 @@@
           (list (concat "\\<\\(" c-keywords "\\)\\>")
                 '(0 font-lock-keyword-face))
  
+          (list (concat "\\<\\(" c-constants "\\)\\>")
+                '(0 font-lock-variable-name-face))
+ 
           ;; Handle numbers too.
           ;;
           ;; This looks strange, I know.  It corresponds to the
@@@ -1401,11 -1409,11 +1409,11 @@@
                      "for" "goto" "if" "implements" "import" "instanceof"
                      "int" "interface" "long" "native" "new" "package"
                      "private" "protected" "public" "return" "short"
-                     "static" "super" "switch" "synchronized" "this"
-                     "throw" "throws" "transient" "try" "void" "volatile"
-                     "while"
+                     "static" "switch" "synchronized" "throw" "throws"
+                     "transient" "try" "void" "volatile" "while"))
  
-                     "false" "null" "true")))
+       (java-constants
+        (mdw-regexps "false" "null" "super" "this" "true")))
  
      (setq font-lock-keywords
          (list
@@@ -1414,6 -1422,10 +1422,10 @@@
           (list (concat "\\<\\(" java-keywords "\\)\\>")
                 '(0 font-lock-keyword-face))
  
+          ;; Handle the magic constants defined above.
+          (list (concat "\\<\\(" java-constants "\\)\\>")
+                '(0 font-lock-variable-name-face))
+ 
           ;; Handle numbers too.
           ;;
           ;; The following isn't quite right, but it's close enough.
@@@ -1495,9 -1507,6 +1507,9 @@@
  
  (defun mdw-fontify-scala ()
  
 +  ;; Comment filling.
 +  (setq mdw-fill-prefix mdw-c-comment-fill-prefix)
 +
    ;; Define things to be fontified.
    (make-local-variable 'font-lock-keywords)
    (let ((scala-keywords
@@@ -1509,7 -1518,7 +1521,7 @@@
                      "var" "while" "with" "yield"))
        (scala-constants
         (mdw-regexps "false" "null" "super" "this" "true"))
 -      (punctuation "\\s.\\|\\s(\\|\\s)\\|\\s\\\\|\\s/"))
 +      (punctuation "[-!%^&*=+:@#~/?\\|`]"))
  
      (setq font-lock-keywords
          (list
@@@ -1594,22 -1603,22 +1606,22 @@@
    ;; Now define things to be fontified.
    (make-local-variable 'font-lock-keywords)
    (let ((csharp-keywords
-        (mdw-regexps "abstract" "as" "base" "bool" "break"
-                     "byte" "case" "catch" "char" "checked"
-                     "class" "const" "continue" "decimal" "default"
-                     "delegate" "do" "double" "else" "enum"
-                     "event" "explicit" "extern" "false" "finally"
-                     "fixed" "float" "for" "foreach" "goto"
-                     "if" "implicit" "in" "int" "interface"
-                     "internal" "is" "lock" "long" "namespace"
-                     "new" "null" "object" "operator" "out"
-                     "override" "params" "private" "protected" "public"
-                     "readonly" "ref" "return" "sbyte" "sealed"
-                     "short" "sizeof" "stackalloc" "static" "string"
-                     "struct" "switch" "this" "throw" "true"
-                     "try" "typeof" "uint" "ulong" "unchecked"
-                     "unsafe" "ushort" "using" "virtual" "void"
-                     "volatile" "while" "yield")))
+        (mdw-regexps "abstract" "as" "bool" "break" "byte" "case" "catch"
+                     "char" "checked" "class" "const" "continue" "decimal"
+                     "default" "delegate" "do" "double" "else" "enum"
+                     "event" "explicit" "extern" "finally" "fixed" "float"
+                     "for" "foreach" "goto" "if" "implicit" "in" "int"
+                     "interface" "internal" "is" "lock" "long" "namespace"
+                     "new" "object" "operator" "out" "override" "params"
+                     "private" "protected" "public" "readonly" "ref"
+                     "return" "sbyte" "sealed" "short" "sizeof"
+                     "stackalloc" "static" "string" "struct" "switch"
+                     "throw" "try" "typeof" "uint" "ulong" "unchecked"
+                     "unsafe" "ushort" "using" "virtual" "void" "volatile"
+                     "while" "yield"))
+ 
+       (csharp-constants
+        (mdw-regexps "base" "false" "null" "this" "true")))
  
      (setq font-lock-keywords
          (list
@@@ -1618,6 -1627,10 +1630,10 @@@
           (list (concat "\\<\\(" csharp-keywords "\\)\\>")
                 '(0 font-lock-keyword-face))
  
+          ;; Handle the magic constants defined above.
+          (list (concat "\\<\\(" csharp-constants "\\)\\>")
+                '(0 font-lock-variable-name-face))
+ 
           ;; Handle numbers too.
           ;;
           ;; The following isn't quite right, but it's close enough.
@@@ -1657,12 -1670,12 +1673,12 @@@
  
    (let ((fsharp-keywords
         (mdw-regexps "abstract" "and" "as" "assert" "atomic"
-                     "base" "begin" "break"
+                     "begin" "break"
                      "checked" "class" "component" "const" "constraint"
                      "constructor" "continue"
                      "default" "delegate" "do" "done" "downcast" "downto"
                      "eager" "elif" "else" "end" "exception" "extern"
-                     "false" "finally" "fixed" "for" "fori" "fun" "function"
+                     "finally" "fixed" "for" "fori" "fun" "function"
                      "functor"
                      "global"
                      "if" "in" "include" "inherit" "inline" "interface"
@@@ -1670,20 -1683,21 +1686,21 @@@
                      "lazy" "let"
                      "match" "measure" "member" "method" "mixin" "module"
                      "mutable"
-                     "namespace" "new" "null"
-                     "object""of" "open" "or" "override"
+                     "namespace" "new"
+                     "object" "of" "open" "or" "override"
                      "parallel" "params" "private" "process" "protected"
                      "public" "pure"
                      "rec" "recursive" "return"
                      "sealed" "sig" "static" "struct"
-                     "tailcall" "then" "to" "trait" "true" "try" "type"
+                     "tailcall" "then" "to" "trait" "try" "type"
                      "upcast" "use"
                      "val" "virtual" "void" "volatile"
                      "when" "while" "with"
                      "yield"))
  
        (fsharp-builtins
-        (mdw-regexps "asr" "land" "lor" "lsl" "lsr" "lxor" "mod"))
+        (mdw-regexps "asr" "land" "lor" "lsl" "lsr" "lxor" "mod"
+                     "base" "false" "null" "true"))
  
        (bang-keywords
         (mdw-regexps "do" "let" "return" "use" "yield"))