Merge branch 'master' of git+ssh://ponder.ncipher.com/~mwooding/etc/profile

* 'master' of git+ssh://ponder.ncipher.com/~mwooding/etc/profile:
  emerge-hack: A new script for Git merging.
  vncrc, xinitrc: Don't do so much Gnome fiddling.
  dot-emacs: Fiddle C indentation settings.
  emacs: Make postscript printing more sensible.

diff --git a/dot-emacs.el b/dot-emacs.el
index 1a1b90a..e2e8998 100644 (file)
--- a/dot-emacs.el
+++ b/dot-emacs.el
@@ -605,6 +605,9 @@ doesn't cope with anything approximating a complicated case."
     (mdw-number-face :foreground "yellow")
     (font-lock-function-name-face :weight bold)
     (font-lock-variable-name-face :slant italic)
+    (font-lock-comment-delimiter-face
+       :foreground ,(if window-system "SeaGreen1" "green")
+       :slant italic)
     (font-lock-comment-face
        :foreground ,(if window-system "SeaGreen1" "green")
        :slant italic)