dot/emacs, dot/profile, el/dot-emacs.el: Moving back to Chromium.

[profile] / dot / emacs

diff --git a/dot/emacs b/dot/emacs
index 6cd38f31b01db9e079110816454c8f2aee731321..bc481b7ad96f45955969dee00fababf2a785fb95 100644 (file)
--- a/dot/emacs
+++ b/dot/emacs
@@ -36,6 +36,9 @@
 (require 'cl)
 (require 'dot-emacs)
 
+(unless (mdw-emacs-version-p 25)
+  (trap (require 'bracketed-paste) (bracketed-paste-enable)))
+
 ;;;--------------------------------------------------------------------------
 ;;; Some random initialisation.
 
@@ -422,7 +425,7 @@
 (setq url-cookie-untrusted-urls '("."))
 
 (setq browse-url-browser-function (mdw-good-url-browser)
-      browse-url-generic-program "mdw-chrome"
+      browse-url-generic-program "chromium"
       browse-url-mozilla-program "mdw-iceweasel")
 
 (setq w3m-default-display-inline-images t
@@ -588,7 +591,8 @@
        (w32 (font . "fixed613 10")
             (background-color . "black")
             (foreground-color . "white"))
-       (nil (menu-bar-lines . 0))))
+       (nil (menu-bar-lines . 0)
+            (background-color . nil))))
 (let ((backg (frame-parameter nil 'background-color)))
   (if (and backg window-system)
       (push (cons 'background-color backg) default-frame-alist)))
@@ -800,8 +804,7 @@
        TeXinfo-mode-hook tex-mode-hook latex-mode-hook
        texinfo-mode-hook emacs-lisp-mode-hook scheme-mode-hook
        lisp-mode-hook lisp-interaction-mode-hook makefile-mode-hook
-       inferior-lisp-mode-hook slime-repl-mode-hook
-       inferior-emacs-lisp-mode-hook
+       inferior-lisp-mode-hook slime-repl-mode-hook ielm-mode-hook
        sml-mode-hook haskell-mode-hook erlang-mode-hook
        smalltalk-mode-hook rexx-mode-hook lua-mode-hook
        arm-assembler-mode-hook))
@@ -948,7 +951,7 @@
   (add-hook 'lisp-mode-hook 'mdw-fontify-lispy t)
   (add-hook 'inferior-lisp-mode-hook 'mdw-fontify-lispy t)
   (add-hook 'lisp-interaction-mode-hook 'mdw-fontify-lispy t)
-  (add-hook 'inferior-emacs-lisp-mode-hook 'mdw-fontify-lispy t)
+  (add-hook 'ielm-mode-hook 'mdw-fontify-lispy t)
   (add-hook 'slime-repl-mode-hook 'mdw-fontify-lispy t)
   (add-hook 'lisp-mode-hook 'mdw-common-lisp-indent t)
   (add-hook 'inferior-lisp-mode-hook
@@ -984,7 +987,7 @@
        ("^html?$" "." "sensible-browser %o")))
 
 (setq TeX-view-program-list
-      '(("mupdf" "mupdf %o" (mode-io-correlate " %(outpage)"))))
+      '(("mupdf" ("mupdf %o" (mode-io-correlate " %(outpage)")))))
 
 (setq TeX-view-program-selection
       '(((output-dvi style-pstricks) "dvips and gv")