X-Git-Url: https://git.distorted.org.uk/~mdw/profile/blobdiff_plain/d70716b50ff8627257daad4e0fd9fe40a196cc77..6c680ad0afda24e64bb09799d94c619f7641e429:/el/dot-emacs.el

diff --git a/el/dot-emacs.el b/el/dot-emacs.el
index 6e28111..dc4b041 100644
--- a/el/dot-emacs.el
+++ b/el/dot-emacs.el
@@ -516,7 +516,8 @@ If NEW-SESSION-P, start a new session."
 	(select-window window)))))
 
 (defvar mdw-good-url-browsers
-  '((w3m . mdw-w3m-browse-url)
+  '(browse-url-generic
+    (w3m . mdw-w3m-browse-url)
     browse-url-w3
     browse-url-mozilla)
   "List of good browsers for mdw-good-url-browsers.
@@ -705,7 +706,8 @@ case."
   (when (and (boundp 'whitespace-style)
 	     (fboundp 'whitespace-mode))
     (let ((whitespace-style (remove 'trailing whitespace-style)))
-      (whitespace-mode arg))))
+      (whitespace-mode arg))
+    (setq show-trailing-whitespace whitespace-mode)))
 
 (defun mdw-misc-mode-config ()
   (and mdw-auto-indent
@@ -806,7 +808,7 @@ doesn't match any of the regular expressions in
     (mdw-define-face variable-pitch
       (((type x)) :family "sans" :height 100))
   (mdw-define-face variable-pitch
-    (((type x)) :family "helvetica" :height 120)))
+    (((type x)) :family "helvetica" :height 90)))
 (mdw-define-face region
   (((type tty) (class color)) :background "blue")
   (((type tty) (class mono)) :inverse-video t)
@@ -2179,7 +2181,6 @@ strip numbers instead."
   (modify-syntax-entry ?\n ">" messages-mode-syntax-table)
   (setq comment-start "# ")
   (setq comment-end "")
-  (turn-on-font-lock-if-enabled)
   (run-hooks 'messages-mode-hook))
 
 (defun cpp-messages-mode ()
@@ -2206,7 +2207,6 @@ strip numbers instead."
 				      "\\)\\>\\|[0-9]+\\|$\\)\\)")
 			      '(1 font-lock-keyword-face)))
 		  messages-mode-keywords)))
-  (turn-on-font-lock-if-enabled)
   (run-hooks 'cpp-messages-mode-hook))
 
 (add-hook 'messages-mode-hook 'mdw-misc-mode-config t)
@@ -2257,7 +2257,6 @@ strip numbers instead."
   (modify-syntax-entry ?\n ">" mallow-driver-mode-syntax-table)
   (setq comment-start "%# ")
   (setq comment-end "")
-  (turn-on-font-lock-if-enabled)
   (run-hooks 'mallow-driver-mode-hook))
 
 (add-hook 'mallow-driver-hook 'mdw-misc-mode-config t)
@@ -2300,7 +2299,6 @@ strip numbers instead."
 	 '("\\(\\s.\\|\\s(\\|\\s)\\|\\s\\\\|\\s/\\)" (0 mdw-punct-face))))
   (setq font-lock-defaults
 	'(nfast-debug-mode-keywords nil nil nil nil))
-  (turn-on-font-lock-if-enabled)
   (run-hooks 'nfast-debug-mode-hook))
 
 ;;;--------------------------------------------------------------------------