X-Git-Url: https://git.distorted.org.uk/~mdw/profile/blobdiff_plain/8af2ea12afcdfe370b7fcdfc0f62c52c25be9f64..5223adaa187d2231f03f59a44473b93192bc6968:/el/dot-emacs.el

diff --git a/el/dot-emacs.el b/el/dot-emacs.el
index f5d4595..f0d41c3 100644
--- a/el/dot-emacs.el
+++ b/el/dot-emacs.el
@@ -1409,7 +1409,8 @@ If NEW-SESSION-P, start a new session."
   '(define-key w3m-mode-map [?\e ?\r] 'w3m-view-this-url-new-session))
 
 (defcustom mdw-good-url-browsers
-  '(browse-url-mozilla
+  '(browse-url-firefox
+    browse-url-mozilla
     browse-url-generic
     (w3m . mdw-w3m-browse-url)
     browse-url-w3)
@@ -2215,6 +2216,10 @@ doesn't match any of the regular expressions in
 (mdw-define-face magit-hash
   (((min-colors 64)) :foreground "grey40")
   (((class color)) :foreground "blue"))
+(mdw-define-face magit-popup-argument
+  (((min-colors 64)) :foreground "SeaGreen1")
+  (((class color)) :foreground "green")
+  (t :weight bold))
 (mdw-define-face magit-diff-hunk-heading
   (((min-colors 64)) :foreground "grey70" :background "grey25")
   (((class color)) :foreground "yellow"))
@@ -2252,8 +2257,14 @@ doesn't match any of the regular expressions in
 
 (mdw-define-face erc-my-nick-face
   (t :foreground "yellow" :weight bold))
+(mdw-define-face erc-current-nick-face
+  (t :foreground "yellow" :weight bold))
 (mdw-define-face erc-input-face
   (t :foreground "yellow"))
+(mdw-define-face erc-action-face
+  ())
+(mdw-define-face erc-button
+  (t :foreground "cyan" :underline t :weight semi-bold))
 
 (mdw-define-face woman-bold
   (t :weight bold))
@@ -2513,6 +2524,10 @@ set."
   (c-class-key . "class")
   (c-backslash-column . 72)
   (c-label-minimum-indentation . 0)
+  (c-indent-comments-syntactically-p t)
+  (c-indent-comment-alist (end-block . (column . nil))
+			  (cpp-end-block . (column . nil))
+			  (other . (column . nil)))
   (c-offsets-alist (substatement-open . (add 0 c-indent-one-line-block))
 		   (defun-open . (add 0 c-indent-one-line-block))
 		   (arglist-cont-nonempty . mdw-c-lineup-arglist)