Merge remote-tracking branches 'crybaby/master', 'gibson/master' and 'mdwdev/master'

* crybaby/master:
  dot/swank.lisp: Only force `:fd-handler' on Lisps which can do it.
  dot/emacs: Add Viper cursor-colour flail.
  dot/emacs: Apply Viper settings as the defaults.
  dot/emacs, el/dot-emacs.el: Set up Viper mode.

* gibson/master:
  firefox/stylus/Scribd Reveal.css: Hack to override Scribd sign-in bollocks.
  firefox/stylus/*.css: New styles for Fandom and Vridar.
  el/dot-emacs.el: Add a switch for the `--rebase-merges' option.
  dot/emacs: Move the cursor properly.

* mdwdev/master:
  firefox/stylus/: Add styling for Trustonic's awful Confluence wiki.
  el/dot-emacs.el: Move the comment indentation weirdness to Alec-emulation.

diff --combined dot/emacs
index 370cfee,34d7500,d67444e,370cfee..ad17a56
--- 1/dot/emacs
--- 2/dot/emacs
--- 3/dot/emacs
--- 4/dot/emacs
+++ b/dot/emacs
@@@@@ -389,6 -389,6 -389,8 -389,6 +389,8 @@@@@
    (setq-default comment-column 40)    ;Set a standard comment column
    (setq-default truncate-partial-width-windows nil
              truncate-lines t)
++ +(setq line-move-visual t
++ +      visual-order-cursor-movement t)
    (setq default-indicate-empty-lines t)
    (setq view-read-only t)
    (setq-default view-exit-action #'kill-buffer)
@@@@@ -423,6 -423,20 -425,6 -423,6 +425,20 @@@@@
          '(("en_GB-ize-w_accents" "[[:alpha:]]" "[^[:alpha:]]" "'" t
         ("-d" "en_GB-ize-w_accents") nil utf-8))
          ispell-silently-savep t)
+ ++(setq-default viper-case-fold-search t
+ ++          viper-electric-mode t
+ ++          viper-ex-style-motion nil
+ ++          viper-ex-style-editing nil
+ ++          viper-expert-level 5
+ ++          viper-inhibit-startup-message t
+ ++          ;;viper-insert-state-cursor-color "red"
+ ++          viper-no-multiple-ESC nil
+ ++          viper-re-query-replace t
+ ++          viper-re-search t
+ ++          ;;viper-replace-overlay-cursor-color "red"
+ ++          viper-shift-width 2
+ ++          viper-vi-style-in-minibuffer nil
+ ++          viper-want-ctl-h-help t)
    (trap
      (require 'uniquify)
      (setq uniquify-buffer-name-style 'post-forward-angle-brackets)
@@@@@ -437,6 -451,13 -439,6 -437,6 +453,13 @@@@@
      (tool-bar-mode 0))
    (trap (or mdw-fast-startup (global-auto-revert-mode t)))
    
+ ++(defun mdw-set-viper-cursor-colour ()
+ ++  ;; ?? doesn't seem to work
+ ++  (set-frame-parameter nil 'cursor-color "green")
+ ++  (message ";; %S" post-command-hook)
+ ++  (sit-for 2))
+ ++;;(add-hook 'viper-vi-state-hook 'mdw-set-viper-cursor-colour)
+ ++
    (defvar mdw-black-background t)
    
    (eval-after-load "outline"

diff --combined el/dot-emacs.el
index 74ced5a,a11a898,7623c72,8a0abb9..e3e1b7c
--- 1/el/dot-emacs.el
--- 2/el/dot-emacs.el
--- 3/el/dot-emacs.el
--- 4/el/dot-emacs.el
+++ b/el/dot-emacs.el
@@@@@ -1678,6 -1678,15 -1678,6 -1678,6 +1678,15 @@@@@ doesn't match any of the regular expres
      (((class color)) :background "cyan")
      (t :inverse-video t))
    
+ ++(mdw-define-face viper-minibuffer-emacs (t nil))
+ ++(mdw-define-face viper-minibuffer-insert (t nil))
+ ++(mdw-define-face viper-minibuffer-vi (t nil))
+ ++(mdw-define-face viper-replace-overlay
+ ++  (((min-colors 64)) :background "darkred")
+ ++  (((class color)) :background "red")
+ ++  (t :inverse-video t))
+ ++(mdw-define-face viper-search (t :inherit isearch))
+ ++
    (mdw-define-face holiday-face
      (t :background "red"))
    (mdw-define-face calendar-today-face
@@@@@ -2208,14 -2217,14 -2208,14 -2208,14 +2217,14 @@@@@ set.
    
    (mdw-define-c-style mdw-trustonic-c (mdw-c)
      (c-basic-offset . 4)
---   (c-indent-comment-alist (anchored-comment . (column . 0))
---                       (end-block . (space . 1))
---                       (cpp-end-block . (space . 1))
---                       (other . (space . 1)))
      (c-offsets-alist (access-label . -2)))
    
    (mdw-define-c-style mdw-trustonic-alec-c (mdw-trustonic-c)
      (comment-column . 0)
+++   (c-indent-comment-alist (anchored-comment . (column . 0))
+++                       (end-block . (space . 1))
+++                       (cpp-end-block . (space . 1))
+++                       (other . (space . 1)))
      (c-offsets-alist (arglist-cont-nonempty . mdw-c-indent-arglist-nested)))
    
    (defun mdw-set-default-c-style (modes style)
@@@@@ -3195,7 -3204,6 -3195,6 -3195,6 +3204,7 @@@@@ strip numbers instead.
      ;; Miscellaneous fiddling.
      (mdw-standard-fill-prefix "\\([ \t]*#+[ \t]*\\)")
      (setq indent-tabs-mode nil)
 +++  (set (make-local-variable 'forward-sexp-function) nil)
    
      ;; Now define fontification things.
      (make-local-variable 'font-lock-keywords)
@@@@@ -4978,7 -4986,7 -4977,9 -4977,7 +4987,9 @@@@@ This allows you to pass a list of argum
                           magit-diff-refresh-popup
                           magit-diff-mode-refresh-popup
                           magit-revision-mode-refresh-popup))
-- -        (magit-define-popup-switch popup ?R "Reverse diff" "-R"))))
++ +        (magit-define-popup-switch popup ?R "Reverse diff" "-R"))
++ +      (magit-define-popup-switch 'magit-rebase-popup ?r
++ +                                 "Rebase merges" "--rebase-merges")))
    
    (defadvice magit-wip-commit-buffer-file
        (around mdw-just-this-buffer activate compile)