Merge remote-tracking branch 'staging/master'

* staging/master:
  bg/harley-quinn.jpg: New background image.
  setup: Sort the backgrounds by name, and reformat a little.

diff --git a/dot/emacs b/dot/emacs
index 0eddaa1..583cb96 100644 (file)
--- a/dot/emacs
+++ b/dot/emacs
@@ -312,7 +312,7 @@
 
 (setq browse-url-browser-function (mdw-good-url-browser)
       browse-url-generic-program "mdw-chrome"
-      browse-url-mozilla-program "firefox")
+      browse-url-mozilla-program "mdw-iceweasel")
 
 (setq w3m-default-display-inline-images t
       w3m-use-cookies t)

diff --git a/el/dot-emacs.el b/el/dot-emacs.el
index a3accbc..eb30141 100644 (file)
--- a/el/dot-emacs.el
+++ b/el/dot-emacs.el
@@ -573,10 +573,10 @@ If NEW-SESSION-P, start a new session."
        (select-window window)))))
 
 (defvar mdw-good-url-browsers
-  '(browse-url-generic
+  '(browse-url-mozilla
+    browse-url-generic
     (w3m . mdw-w3m-browse-url)
-    browse-url-w3
-    browse-url-mozilla)
+    browse-url-w3)
   "List of good browsers for mdw-good-url-browsers.
 Each item is a browser function name, or a cons (CHECK . FUNC).
 A symbol FOO stands for (FOO . FOO).")