Merge branch 'master' of github.com:bbatsov/emacs-prelude

This commit is contained in:
Bozhidar Batsov 2011-10-11 21:09:08 +03:00
commit df61675d06

View file

@ -411,15 +411,15 @@
;; whitespace-mode ;; whitespace-mode
`(whitespace-space ((,class (:background ,zenburn-bg :foreground ,zenburn-bg+1)))) `(whitespace-space ((,class (:background ,zenburn-bg :foreground ,zenburn-bg+1))))
`(whitespace-hspace ((,class (:background ,zenburn-bg)))) `(whitespace-hspace ((,class (:background ,zenburn-bg :foreground ,zenburn-bg+1))))
`(whitespace-tab ((,class (:background ,zenburn-bg)))) `(whitespace-tab ((,class (:background ,zenburn-bg :foreground ,zenburn-red))))
`(whitespace-newline ((,class (:foreground ,zenburn-bg+1)))) `(whitespace-newline ((,class (:foreground ,zenburn-bg+1 :background ,zenburn-bg))))
`(whitespace-trailing ((,class (:background ,zenburn-red :foreground ,zenburn-yellow)))) `(whitespace-trailing ((,class (:foreground ,zenburn-red :background ,zenburn-bg))))
`(whitespace-line ((,class (:background ,zenburn-bg-05 :foreground ,zenburn-magenta)))) `(whitespace-line ((,class (:background ,zenburn-bg-05 :foreground ,zenburn-magenta))))
`(whitespace-space-before-tab ((,class ()))) `(whitespace-space-before-tab ((,class (:background ,zenburn-orange :foreground ,zenburn-orange))))
`(whitespace-indentation ((,class ()))) `(whitespace-indentation ((,class (:background ,zenburn-yellow, :foreground ,zenburn-red))))
`(whitespace-empty ((,class ()))) `(whitespace-empty ((,class (:background ,zenburn-yellow :foreground ,zenburn-red))))
`(whitespace-space-after-tab ((,class ()))) `(whitespace-space-after-tab ((,class (:background ,zenburn-yellow :foreground ,zenburn-red))))
;; wanderlust ;; wanderlust
`(wl-highlight-folder-few-face ((,class (:foreground ,zenburn-red-2)))) `(wl-highlight-folder-few-face ((,class (:foreground ,zenburn-red-2))))