dot/emacs, dot/profile, el/dot-emacs.el: Back to Firefox/Iceweasel.

This reverts commit 90ac1ffc018d15315a2e95deb822f3ca168a9fee,
"dot/emacs, dot/profile, el/dot-emacs.el: Moving back to Chromium."

Maybe I'll make up my mind some day.

diff --git a/dot/emacs b/dot/emacs
index 97c0174821c0132e7d6f8128023b8264a6f48328..c339a176ac22a99999a7e354fd47a102e6f78211 100644 (file)
--- a/dot/emacs
+++ b/dot/emacs
@@ -431,7 +431,7 @@
 (setq url-cookie-untrusted-urls '("."))
 
 (setq browse-url-browser-function (mdw-good-url-browser)
 (setq url-cookie-untrusted-urls '("."))
 
 (setq browse-url-browser-function (mdw-good-url-browser)

-      browse-url-generic-program "chromium"
+      browse-url-generic-program "mdw-chrome"

       browse-url-mozilla-program "mdw-iceweasel")
 
 (setq w3m-default-display-inline-images t
       browse-url-mozilla-program "mdw-iceweasel")
 
 (setq w3m-default-display-inline-images t

diff --git a/dot/profile b/dot/profile
index d67d56a289c007442f8aa971a0a21a3dc084cb9a..268619469aa4df02a2dd6a0d34ebacfb841b3207 100644 (file)
--- a/dot/profile
+++ b/dot/profile
@@ -234,7 +234,7 @@ if __mdw_programp distcc; then CCACHE_PREFIX=distcc; export CCACHE_PREFIX; fi
 ## graphical one.
 set -- elinks w3m lynx
 case ${DISPLAY+t} in
 ## graphical one.
 set -- elinks w3m lynx
 case ${DISPLAY+t} in

-  t) set -- chromium mdw-iceweasel mdw-chrome iceweasel firefox "$@" ;;
+  t) set -- mdw-iceweasel mdw-chrome iceweasel firefox "$@" ;;

 esac
 for b in "$@"; do
   if __mdw_programp $b; then BROWSER=$b; export BROWSER; break; fi
 esac
 for b in "$@"; do
   if __mdw_programp $b; then BROWSER=$b; export BROWSER; break; fi

diff --git a/el/dot-emacs.el b/el/dot-emacs.el
index 39ffa6f919db56b331c090b1d0327878374ed11c..76bac70215a479492cbdf88595a151dfd7e789c9 100644 (file)
--- a/el/dot-emacs.el
+++ b/el/dot-emacs.el
@@ -1035,8 +1035,7 @@ (eval-after-load 'w3m
   '(define-key w3m-mode-map [?\e ?\r] 'w3m-view-this-url-new-session))
 
 (defvar mdw-good-url-browsers
   '(define-key w3m-mode-map [?\e ?\r] 'w3m-view-this-url-new-session))
 
 (defvar mdw-good-url-browsers

-  '(browse-url-chromium
-    browse-url-mozilla
+  '(browse-url-mozilla

     browse-url-generic
     (w3m . mdw-w3m-browse-url)
     browse-url-w3)
     browse-url-generic
     (w3m . mdw-w3m-browse-url)
     browse-url-w3)