Skip to content

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also compare across forks.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also compare across forks.
...
Checking mergeability… Don’t worry, you can still create the pull request.
  • 17 commits
  • 3 files changed
  • 0 commit comments
  • 1 contributor
Commits on May 21, 2012
@listx listx some color mods
These changes are somewhat arbitrary and do not really go with the
zenburn style, but I like them.
65ddadc
@listx listx avoid theme name conflict with original 538f13f
Commits on May 23, 2012
@listx listx simplify colors
Remove some colors that are rarely used and are very much like the
existing colors.
0f1a5e0
@listx listx return to using the original colors of zenburn
Use the original zenburn colors more (at least the font-lock ones, which
are the ones used across various modes). These colors are in line with
the ones from https://github.com/dbrock/zenburn-el.git, commit
2b0672b04ef3e95c25f849dceb10d669296a188b.
8d8ef15
Commits on Jun 08, 2012
@listx listx add four additional custom faces, for numbers e814a24
@listx listx add README for this branch 0ed8d3e
Commits on Jun 11, 2012
@listx listx emacs 24 version: avoid name conflict d57a587
@listx listx emacs 24 version: make it the same as the <24 version 0c667f1
@listx listx fix syntax error c0b3016
@listx listx fix wrong theme name 08480dc
Commits on Jun 17, 2012
@listx listx more color tweaks to match original zenburn
The preprocessor ('#include' in C) and constants (e.g., 'NULL' in C)
were orange/bold and red/bold in the original Zenburn.
5afb3cb
Commits on Jun 21, 2012
@listx listx function names: use default foreground color 85dfa8e
Commits on Jul 27, 2012
@listx listx org-mode: don't show hidden stars 8b6d2e3
Commits on Jan 22, 2013
@listx listx higher contrast primary fg/bg 59313e7
Commits on Apr 25, 2013
@listx listx less off-theme colors aef35af
@listx listx Merge branch 'master' into mod 28f87c0
@listx listx more elegant region color c4ddda5
Showing with 118 additions and 46 deletions.
  1. +44 −0 README-mod
  2. +42 −25 color-theme-zenburn.el → color-theme-zenburn-mod.el
  3. +32 −21 zenburn-theme.el → zenburn-mod-theme.el
View
44 README-mod
@@ -0,0 +1,44 @@
+This "mod" branch changes back some of the colors, at least the font-lock*
+ones, to match the original Zenburn colors from zenburn.el by Daniel Brockman
+(github.com/dbrock). This branch also adds four font-lock* faces; these are
+font-lock-{decimal,hex,float,octal}-face. These four can be added by
+customizing your .emacs file like in the way below:
+
+; adopted from http://stackoverflow.com/questions/8860050/emacs-c-mode-how-do-you-syntax-highlight-hex-numbers
+(make-face 'font-lock-hex-face)
+(setq font-lock-hex-face 'font-lock-hex-face)
+(make-face 'font-lock-float-face)
+(setq font-lock-float-face 'font-lock-float-face)
+(make-face 'font-lock-decimal-face)
+(setq font-lock-decimal-face 'font-lock-decimal-face)
+(make-face 'font-lock-octal-face)
+(setq font-lock-octal-face 'font-lock-octal-face)
+(setq number-mode-list
+ '( c-mode-hook
+ c++-mode-hook
+ lisp-mode-hook
+ emacs-lisp-mode-hook
+ haskell-mode-hook
+ python-mode-hook
+ cperl-mode-hook
+ )
+)
+(dolist (mode number-mode-list)
+ (add-hook mode
+ '(lambda ()
+ (font-lock-add-keywords nil
+ '(
+ ; Valid hex number (will highlight invalid suffix though)
+ ("\\b0x[[:xdigit:]]+[uUlL]*\\b" . font-lock-hex-face)
+ ; Valid floating point number.
+ ("\\(\\b[0-9]+\\|\\)\\(\\.\\)\\([0-9]+\\(e[-]?[0-9]+\\)?\\([lL]?\\|[dD]?[fF]?\\)\\)\\b" (1 font-lock-float-face) (2 font-lock-decimal-face) (3 font-lock-float-face))
+ ; Valid decimal number. Must be before octal regexes otherwise 0 and 0l
+ ; will be highlighted as errors. Will highlight invalid suffix though.
+ ("\\b\\(\\(0\\|[1-9][0-9]*\\)[uUlL]*\\)\\b" 1 font-lock-decimal-face)
+ ; Valid octal number
+ ("\\b0[0-7]+[uUlL]*\\b" . font-lock-octal-face)
+ )
+ )
+ )
+ )
+)
View
67 color-theme-zenburn.el → color-theme-zenburn-mod.el
@@ -53,12 +53,10 @@
;; color definitions
;; colors with +x are lighter, colors with -x are darker
(defvar zenburn-fg "#dcdccc")
-(defvar zenburn-fg-1 "#656555")
-(defvar zenburn-bg-1 "#2b2b2b")
+(defvar zenburn-bg-1 "#282828")
(defvar zenburn-bg "#3f3f3f")
(defvar zenburn-bg+1 "#4f4f4f")
(defvar zenburn-bg+2 "#5f5f5f")
-(defvar zenburn-bg+3 "#6f6f6f")
(defvar zenburn-red+1 "#dca3a3")
(defvar zenburn-red "#cc9393")
(defvar zenburn-red-1 "#bc8383")
@@ -66,6 +64,7 @@
(defvar zenburn-red-3 "#9c6363")
(defvar zenburn-red-4 "#8c5353")
(defvar zenburn-orange "#dfaf8f")
+(defvar zenburn-orange+1 "#ffc9a4")
(defvar zenburn-yellow "#f0dfaf")
(defvar zenburn-yellow-1 "#e0cf9f")
(defvar zenburn-yellow-2 "#d0bf8f")
@@ -82,9 +81,17 @@
(defvar zenburn-blue-2 "#6ca0a3")
(defvar zenburn-blue-3 "#5c888b")
(defvar zenburn-blue-4 "#4c7073")
-(defvar zenburn-blue-5 "#366060")
(defvar zenburn-magenta "#dc8cc3")
+;; custom colors
+(defvar zenburn-bg-m1 "#1e2320")
+(defvar zenburn-bg-m2 "#233323")
+(defvar zenburn-blue-m1 "#0000ff")
+(defvar zenburn-yellow-m1 "#ffff00")
+(defvar zenburn-green-m1 "#71d3b4")
+(defvar zenburn-red-m1 "#ff0000")
+(defvar zenburn-yellow+1 "#dfdfbf")
+
(eval-after-load 'term
'(setq ansi-term-color-vector
(vector 'unspecified zenburn-bg
@@ -94,10 +101,10 @@
;; dirty fix
"white")))
-(defun color-theme-zenburn ()
+(defun color-theme-zenburn-mod ()
(interactive)
(color-theme-install
- `(color-theme-zenburn
+ `(color-theme-zenburn-mod
;;; color-theme mapping
((foreground-color . ,zenburn-fg)
(background-color . ,zenburn-bg)
@@ -107,8 +114,12 @@
;;; define some reusable zenburn faces that we can inherit from afterwards
(zenburn-strong-1-face ((t (:foreground ,zenburn-yellow :weight bold))))
(zenburn-strong-2-face ((t (:foreground ,zenburn-orange :weight bold))))
- (zenburn-warning-face ((t (:foreground ,zenburn-yellow-1 :weight bold :underline t))))
- (zenburn-error-face ((t (:foreground ,zenburn-red-1 :weight bold :underline t))))
+ (zenburn-strong-3-face ((t (:foreground ,zenburn-yellow+1 :weight bold))))
+ (zenburn-strong-4-face ((t (:foreground ,zenburn-blue :weight bold))))
+ (zenburn-strong-5-face ((t (:foreground ,zenburn-magenta :weight bold))))
+ (zenburn-warning-face ((t (:foreground ,zenburn-yellow-1 :weight bold))))
+ (zenburn-error-face ((t (:foreground ,zenburn-red-1 :weight bold))))
+ (zenburn-error-2-face ((t (:foreground ,zenburn-red+1 :weight bold))))
;;; basic coloring
(default ((t (:foreground ,zenburn-fg))))
@@ -140,37 +151,43 @@
(match ((t (:background ,zenburn-bg-1 :foreground ,zenburn-orange :weight bold))))
;; faces used by isearch
- (isearch ((t (:foreground ,zenburn-yellow :background ,zenburn-bg-1))))
+ (isearch ((t (:foreground ,zenburn-blue-m1 :background ,zenburn-yellow-m1))))
(isearch-fail ((t (:foreground ,zenburn-fg :background ,zenburn-red-4))))
- (lazy-highlight ((t (:foreground ,zenburn-yellow :background ,zenburn-bg+2))))
+ (lazy-highlight ((t (:foreground ,zenburn-blue-m1 :background ,zenburn-yellow-m1))))
(menu ((t (:foreground ,zenburn-fg :background ,zenburn-bg))))
(minibuffer-prompt ((t (:foreground ,zenburn-yellow))))
(mode-line
- ((t (:foreground ,zenburn-green+1 :background ,zenburn-bg-1))))
+ ((t (:foreground ,zenburn-green+1 :background ,zenburn-bg-m1))))
(mode-line-buffer-id ((t (:inherit zenburn-strong-1-face))))
(mode-line-inactive
((t (:foreground ,zenburn-green-1 :background ,zenburn-bg-1))))
- (region ((t (:background ,zenburn-bg-1))))
+ (region ((t (:foreground ,zenburn-green-m1 :background ,zenburn-bg-m2))))
(secondary-selection ((t (:background ,zenburn-bg+2))))
- (trailing-whitespace ((t (:background ,zenburn-red))))
+ (trailing-whitespace ((t (:background ,zenburn-red-m1))))
(vertical-border ((t (:foreground ,zenburn-fg))))
;;; font lock
(font-lock-builtin-face ((t (:foreground ,zenburn-blue))))
(font-lock-comment-face ((t (:foreground ,zenburn-green))))
(font-lock-comment-delimiter-face ((t (:foreground ,zenburn-green))))
- (font-lock-constant-face ((t (:foreground ,zenburn-green+4))))
+ (font-lock-constant-face ((t (:inherit zenburn-error-2-face))))
(font-lock-doc-face ((t (:foreground ,zenburn-green+1))))
(font-lock-doc-string-face ((t (:foreground ,zenburn-blue+1))))
- (font-lock-function-name-face ((t (:foreground ,zenburn-blue))))
+ (font-lock-function-name-face ((t (:foreground ,zenburn-yellow))))
(font-lock-keyword-face ((t (:inherit zenburn-strong-1-face))))
- (font-lock-negation-char-face ((t (:foreground ,zenburn-fg))))
+ (font-lock-negation-char-face ((t (:inherit zenburn-strong-1-face))))
+ (font-lock-decimal-face ((t (:foreground ,zenburn-blue))))
+ (font-lock-hex-face ((t (:inherit zenburn-strong-4-face))))
+ (font-lock-float-face ((t (:foreground ,zenburn-magenta))))
+ (font-lock-octal-face ((t (:inherit zenburn-strong-5-face))))
(font-lock-preprocessor-face ((t (:foreground ,zenburn-blue))))
(font-lock-string-face ((t (:foreground ,zenburn-red))))
- (font-lock-type-face ((t (:foreground ,zenburn-blue))))
- (font-lock-variable-name-face ((t (:foreground ,zenburn-orange))))
+ (font-lock-type-face ((t (:inherit zenburn-strong-3-face))))
+ (font-lock-variable-name-face ((t (:foreground ,zenburn-yellow))))
(font-lock-warning-face ((t (:inherit zenburn-warning-face))))
+ (font-lock-pseudo-keyword-face ((t (:inherit zenburn-strong-2-face))))
+ (font-lock-operator-face ((t (:inherit zenburn-strong-3-face))))
(c-annotation-face ((t (:inherit font-lock-constant-face))))
@@ -183,10 +200,10 @@
(font-latex-title-4 ((t (:inherit variable-pitch :weight bold))))
;; auto-complete
- (ac-candidate-face ((t (:background ,zenburn-bg+3 :foreground "black"))))
+ (ac-candidate-face ((t (:background ,zenburn-bg+2 :foreground "black"))))
(ac-selection-face ((t (:background ,zenburn-blue-4 :foreground ,zenburn-fg))))
(popup-tip-face ((t (:background ,zenburn-yellow-2 :foreground "black"))))
- (popup-scroll-bar-foreground-face ((t (:background ,zenburn-blue-5))))
+ (popup-scroll-bar-foreground-face ((t (:background ,zenburn-blue-4))))
(popup-scroll-bar-background-face ((t (:background ,zenburn-bg-1))))
(popup-isearch-match ((t (:background ,zenburn-bg :foreground ,zenburn-fg))))
@@ -336,7 +353,7 @@
;; linum-mode
- (linum ((t (:foreground ,zenburn-fg-1 :background ,zenburn-bg-1))))
+ (linum ((t (:foreground ,zenburn-bg+2 :background ,zenburn-bg-1))))
;; magit
(magit-section-title ((t (:inherit zenburn-strong-1-face))))
@@ -469,8 +486,8 @@
(rst-level-6-face ((t (:foreground ,zenburn-green-1))))
;; show-paren
- (show-paren-mismatch ((t (:foreground ,zenburn-red-3 :weight bold))))
- (show-paren-match ((t (:foreground ,zenburn-blue-1 :weight bold))))
+ (show-paren-mismatch ((t (:background ,zenburn-red-3 :weight bold))))
+ (show-paren-match ((t (:background ,zenburn-blue :weight bold))))
;; wanderlust
(wl-highlight-folder-few-face ((t (:foreground ,zenburn-red-2))))
@@ -501,10 +518,10 @@
(wl-highlight-summary-refiled-face ((t (:foreground ,zenburn-fg))))
(wl-highlight-summary-displaying-face ((t (:underline t :weight bold)))))))
-(add-to-list 'color-themes '(color-theme-zenburn
+(add-to-list 'color-themes '(color-theme-zenburn-mod
"Zenburn"
"Bozhidar Batsov <bozhidar.batsov@gmail.com"))
-(provide 'color-theme-zenburn)
+(provide 'color-theme-zenburn-mod)
;;; color-theme-zenburn.el ends here.
View
53 zenburn-theme.el → zenburn-mod-theme.el
@@ -1,4 +1,4 @@
-;;; zenburn-theme.el --- A low contrast color theme for Emacs.
+;;; zenburn-mod-theme.el --- A low contrast color theme for Emacs.
;; Copyright (C) 2011 Bozhidar Batsov
@@ -44,19 +44,20 @@
;; is based.
;;
;;; Code
-(deftheme zenburn "The Zenburn color theme")
+(deftheme zenburn-mod "The Zenburn color theme")
(let ((class '((class color) (min-colors 89)))
;; Zenburn palette
;; colors with +x are lighter, colors with -x are darker
- (zenburn-fg "#dcdccc")
+ (zenburn-fg "#cccccf")
(zenburn-fg-1 "#656555")
(zenburn-bg-1 "#2b2b2b")
(zenburn-bg-05 "#383838")
- (zenburn-bg "#3f3f3f")
+ (zenburn-bg "#22222a")
(zenburn-bg+1 "#4f4f4f")
(zenburn-bg+2 "#5f5f5f")
(zenburn-bg+3 "#6f6f6f")
+ (zenburn-red+2 "#f18c96")
(zenburn-red+1 "#dca3a3")
(zenburn-red "#cc9393")
(zenburn-red-1 "#bc8383")
@@ -81,9 +82,12 @@
(zenburn-blue-3 "#5c888b")
(zenburn-blue-4 "#4c7073")
(zenburn-blue-5 "#366060")
- (zenburn-magenta "#dc8cc3"))
+ (zenburn-magenta "#dc8cc3")
+ ;; custom colors
+ (zenburn-bg-m1 "#1e2320")
+ (zenburn-yellow+1 "#dfdfbf"))
(custom-theme-set-faces
- 'zenburn
+ 'zenburn-mod
'(button ((t (:underline t))))
`(link ((,class (:foreground ,zenburn-yellow :underline t :weight bold))))
`(link-visited ((,class (:foreground ,zenburn-yellow-2 :underline t :weight normal))))
@@ -119,41 +123,48 @@
`(match ((,class (:background ,zenburn-bg-1 :foreground ,zenburn-orange :weight bold))))
;; faces used by isearch
- `(isearch ((,class (:foreground ,zenburn-yellow :background ,zenburn-bg-1))))
+ `(isearch ((,class (:foreground ,zenburn-bg-1 :background ,zenburn-magenta))))
`(isearch-fail ((,class (:foreground ,zenburn-fg :background ,zenburn-red-4))))
- `(lazy-highlight ((,class (:foreground ,zenburn-yellow :background ,zenburn-bg+2))))
+ `(lazy-highlight ((,class (:foreground ,zenburn-bg-1 :background ,zenburn-magenta))))
`(menu ((,class (:foreground ,zenburn-fg :background ,zenburn-bg))))
`(minibuffer-prompt ((,class (:foreground ,zenburn-yellow))))
`(mode-line
((,class (:foreground ,zenburn-green+1
- :background ,zenburn-bg-1
+ :background ,zenburn-bg-m1
:box (:line-width -1 :style released-button)))))
`(mode-line-buffer-id ((,class (:foreground ,zenburn-yellow :weight bold))))
`(mode-line-inactive
((,class (:foreground ,zenburn-green-1
:background ,zenburn-bg-05
:box (:line-width -1 :style released-button)))))
- `(region ((,class (:background ,zenburn-bg-1))))
+ `(region ((,class (:foreground ,zenburn-blue-5 :background ,zenburn-green+4))))
`(secondary-selection ((,class (:background ,zenburn-bg+2))))
- `(trailing-whitespace ((,class (:background ,zenburn-red))))
+ `(trailing-whitespace ((,class (:background ,zenburn-red+2))))
`(vertical-border ((,class (:foreground ,zenburn-fg))))
;;; font lock
`(font-lock-builtin-face ((,class (:foreground ,zenburn-blue))))
`(font-lock-comment-face ((,class (:foreground ,zenburn-green))))
`(font-lock-comment-delimiter-face ((,class (:foreground ,zenburn-green))))
- `(font-lock-constant-face ((,class (:foreground ,zenburn-green+4))))
+ `(font-lock-constant-face ((,class (:foreground ,zenburn-red :weight bold))))
`(font-lock-doc-face ((,class (:foreground ,zenburn-green+1))))
`(font-lock-doc-string-face ((,class (:foreground ,zenburn-blue+1))))
- `(font-lock-function-name-face ((,class (:foreground ,zenburn-blue))))
+ `(font-lock-function-name-face ((,class (:foreground ,zenburn-fg))))
`(font-lock-keyword-face ((,class (:foreground ,zenburn-yellow :weight bold))))
`(font-lock-negation-char-face ((,class (:foreground ,zenburn-fg))))
- `(font-lock-preprocessor-face ((,class (:foreground ,zenburn-blue))))
+ `(font-lock-preprocessor-face ((,class (:foreground ,zenburn-orange :weight bold))))
`(font-lock-string-face ((,class (:foreground ,zenburn-red))))
- `(font-lock-type-face ((,class (:foreground ,zenburn-blue))))
- `(font-lock-variable-name-face ((,class (:foreground ,zenburn-orange))))
- `(font-lock-warning-face ((,class (:foreground ,zenburn-yellow-1 :weight bold :underline t))))
+ `(font-lock-type-face ((,class (:foreground ,zenburn-yellow+1 :weight bold))))
+ `(font-lock-variable-name-face ((,class (:foreground ,zenburn-yellow))))
+ `(font-lock-warning-face ((,class (:foreground ,zenburn-yellow-1 :weight bold))))
+ `(font-lock-pseudo-keyword-face ((,class (:foreground ,zenburn-orange :weight bold))))
+ `(font-lock-operator-face ((,class (:foreground ,zenburn-yellow+1 :weight bold))))
+ ;;; custom font-lock faces for highlighting numbers (see README-mod)
+ `(font-lock-decimal-face ((,class (:foreground ,zenburn-blue))))
+ `(font-lock-hex-face ((,class (:foreground ,zenburn-blue :weight bold))))
+ `(font-lock-float-face ((,class (:foreground ,zenburn-magenta))))
+ `(font-lock-octal-face ((,class (:foreground ,zenburn-magenta :weight bold))))
`(c-annotation-face ((,class (:inherit font-lock-constant-face))))
@@ -415,7 +426,7 @@
`(org-done ((,class (:bold t :weight bold :foreground ,zenburn-green+3))))
`(org-formula ((,class (:foreground ,zenburn-yellow-2))))
`(org-headline-done ((,class (:foreground ,zenburn-green+3))))
- `(org-hide ((,class (:foreground ,zenburn-bg-1))))
+ `(org-hide ((,class (:foreground ,zenburn-bg))))
`(org-level-1 ((,class (:foreground ,zenburn-orange))))
`(org-level-2 ((,class (:foreground ,zenburn-green+1))))
`(org-level-3 ((,class (:foreground ,zenburn-blue-1))))
@@ -532,7 +543,7 @@
;;; custom theme variables
(custom-theme-set-variables
- 'zenburn
+ 'zenburn-mod
`(ansi-color-names-vector [,zenburn-bg ,zenburn-red ,zenburn-green ,zenburn-yellow
,zenburn-blue ,zenburn-magenta ,zenburn-cyan ,zenburn-fg])
@@ -544,10 +555,10 @@
(add-to-list 'custom-theme-load-path
(file-name-as-directory (file-name-directory load-file-name))))
-(provide-theme 'zenburn)
+(provide-theme 'zenburn-mod)
;; Local Variables:
;; no-byte-compile: t
;; End:
-;;; zenburn-theme.el ends here.
+;;; zenburn-mod-theme.el ends here.

No commit comments for this range

Something went wrong with that request. Please try again.