From 6e522b98fa372c72e6b164833bbd68e69e383d8b Mon Sep 17 00:00:00 2001 From: Christopher Monsanto Date: Wed, 20 Jun 2012 22:48:07 -0400 Subject: [PATCH 1/7] w3m, term colors, diary --- .gitignore | 1 + solarized-theme.el | 17 +++++++++++++++++ 2 files changed, 18 insertions(+) create mode 100644 .gitignore diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..016d3b1 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +*.elc \ No newline at end of file diff --git a/solarized-theme.el b/solarized-theme.el index aca7821..5272873 100644 --- a/solarized-theme.el +++ b/solarized-theme.el @@ -151,6 +151,9 @@ `(compilation-message-face ((,class (:foreground ,blue)))) `(compilation-warning-face ((,class (:foreground ,yellow :weight bold :underline t)))) + ;; diary + `(diary ((,class (:foreground ,yellow)))) + ;; dired `(dired-directory ((,class (:foreground ,blue :weight normal)))) `(dired-flagged ((,class (:foreground ,red)))) @@ -670,6 +673,19 @@ ;; volatile highlights `(vhl/default-face ((,class (:background ,green-lc :foreground ,green-hc)))) + ;; w3m + `(w3m-anchor ((,class (:inherit link)))) + `(w3m-arrived-anchor ((,class (:inherit link-visited)))) + `(w3m-form ((,class (:background ,base03 :foreground ,solarized-fg)))) + `(w3m-header-line-location-title ((,class (:background ,base02 :foreground ,yellow)))) + `(w3m-header-line-location-content ((,class (:background ,base02 :foreground ,solarized-fg)))) + `(w3m-bold ((,class (:foreground ,solarized-emph :weight bold)))) + `(w3m-image-anchor ((,class (:background ,solarized-bg :foreground ,cyan :inherit link)))) + `(w3m-image ((,class (:background ,solarized-bg :foreground ,cyan)))) + `(w3m-lnum-minibuffer-prompt ((,class (:foreground ,solarized-emph)))) + `(w3m-lnum-match ((,class (:background ,solarized-hl)))) + `(w3m-lnum ((,class (:underline nil :bold nil :foreground ,red)))) + ;; whitespace-mode `(whitespace-space ((,class (:background ,solarized-bg :foreground ,yellow-lc :inverse-video t)))) @@ -737,6 +753,7 @@ theme-name '(ansi-color-names-vector [solarized-bg red green yellow blue magenta cyan solarized-fg]) + `(ansi-term-color-vector [unspecific ,base01 ,red ,green ,yellow ,blue ,magenta ,cyan ,base03]) ;; fill-column-indicator `(fci-rule-color ,solarized-hl)) From 046452855938bdaaff7b8b6acd683d6a69da52b9 Mon Sep 17 00:00:00 2001 From: Christopher Monsanto Date: Mon, 25 Jun 2012 06:38:34 -0400 Subject: [PATCH 2/7] mic-paren --- solarized-theme.el | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/solarized-theme.el b/solarized-theme.el index 5272873..7681e9a 100644 --- a/solarized-theme.el +++ b/solarized-theme.el @@ -610,6 +610,14 @@ `(show-paren-mismatch ((,class (:foreground ,red :background ,solarized-bg :weight normal :inverse-video t)))) + ;; mic-paren + `(paren-face-match + ((,class (:foreground ,cyan :background ,solarized-bg :weight normal :inverse-video t)))) + `(paren-face-mismatch + ((,class (:foreground ,red :background ,solarized-bg :weight normal :inverse-video t)))) + `(paren-face-no-match + ((,class (:foreground ,red :background ,solarized-bg :weight normal :inverse-video t)))) + ;; SLIME `(slime-repl-inputed-output-face ((,class (:foreground ,red)))) From 1df8781b5286b6b55d7e11100a076eab7fde66be Mon Sep 17 00:00:00 2001 From: Christopher Monsanto Date: Wed, 27 Jun 2012 02:14:35 -0400 Subject: [PATCH 3/7] mumamo --- solarized-theme.el | 3 +++ 1 file changed, 3 insertions(+) diff --git a/solarized-theme.el b/solarized-theme.el index 7681e9a..f5b403a 100644 --- a/solarized-theme.el +++ b/solarized-theme.el @@ -477,6 +477,9 @@ `(mingus-song-file-face ((,class (:foreground ,yellow)))) `(mingus-stopped-face ((,class (:foreground ,red)))) + ;; mumamo + `(mumamo-background-chunk-submode1 ((,class (:background ,solarized-hl)))) + ;; nav `(nav-face-heading ((,class (:foreground ,yellow)))) `(nav-face-button-num ((,class (:foreground ,cyan)))) From 42f8c3da34bb2f84982630074bd2ee9399d70bec Mon Sep 17 00:00:00 2001 From: Christopher Monsanto Date: Thu, 28 Jun 2012 05:17:51 -0400 Subject: [PATCH 4/7] Fixed colors in shell. --- solarized-theme.el | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/solarized-theme.el b/solarized-theme.el index f5b403a..1eb99e9 100644 --- a/solarized-theme.el +++ b/solarized-theme.el @@ -762,8 +762,8 @@ (custom-theme-set-variables theme-name - '(ansi-color-names-vector [solarized-bg red green yellow - blue magenta cyan solarized-fg]) + `(ansi-color-names-vector [,solarized-bg ,red ,green ,yellow + ,blue ,magenta ,cyan ,solarized-fg]) `(ansi-term-color-vector [unspecific ,base01 ,red ,green ,yellow ,blue ,magenta ,cyan ,base03]) ;; fill-column-indicator `(fci-rule-color ,solarized-hl)) From c58a161e2ec17c10877408764eeca049909a7b0f Mon Sep 17 00:00:00 2001 From: Christopher Monsanto Date: Fri, 29 Jun 2012 15:48:12 -0400 Subject: [PATCH 5/7] whoops --- .gitignore | 1 - 1 file changed, 1 deletion(-) delete mode 100644 .gitignore diff --git a/.gitignore b/.gitignore deleted file mode 100644 index 016d3b1..0000000 --- a/.gitignore +++ /dev/null @@ -1 +0,0 @@ -*.elc \ No newline at end of file From 25c507cc5fb5eb5551554946e4383d421e53ed4e Mon Sep 17 00:00:00 2001 From: Christopher Monsanto Date: Fri, 29 Jun 2012 15:55:52 -0400 Subject: [PATCH 6/7] Rename solarized-theme.el. --- solarized-dark-theme.el | 2 +- solarized-light-theme.el | 2 +- solarized-theme-utils.el | 2 +- solarized-theme.el => solarized.el | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) rename solarized-theme.el => solarized.el (99%) diff --git a/solarized-dark-theme.el b/solarized-dark-theme.el index 499f846..548b48e 100644 --- a/solarized-dark-theme.el +++ b/solarized-dark-theme.el @@ -1,4 +1,4 @@ -(require 'solarized-theme) +(require 'solarized) (deftheme solarized-dark "The dark variant of the Solarized colour theme") diff --git a/solarized-light-theme.el b/solarized-light-theme.el index bb07426..15802c9 100644 --- a/solarized-light-theme.el +++ b/solarized-light-theme.el @@ -1,4 +1,4 @@ -(require 'solarized-theme) +(require 'solarized) (deftheme solarized-light "The light variant of the Solarized colour theme") diff --git a/solarized-theme-utils.el b/solarized-theme-utils.el index 50f8415..43912ae 100644 --- a/solarized-theme-utils.el +++ b/solarized-theme-utils.el @@ -25,7 +25,7 @@ ;;;; Code: (require 'cl) -(require 'solarized-theme) +(require 'solarized) (defun solarized-import-faces (&optional regexp already-defined) "Imports current effective face definitions by regular expression diff --git a/solarized-theme.el b/solarized.el similarity index 99% rename from solarized-theme.el rename to solarized.el index 1eb99e9..03a8fb1 100644 --- a/solarized-theme.el +++ b/solarized.el @@ -780,6 +780,6 @@ ;; no-byte-compile: t ;; End: -(provide 'solarized-theme) +(provide 'solarized) ;;; solarized-theme.el ends here. From 97223a1d8f899ffd2e1eff52e959359b0dbd2d7e Mon Sep 17 00:00:00 2001 From: Christopher Monsanto Date: Sat, 30 Jun 2012 01:50:05 -0400 Subject: [PATCH 7/7] typos --- solarized.el | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/solarized.el b/solarized.el index 03a8fb1..c6f5317 100644 --- a/solarized.el +++ b/solarized.el @@ -603,9 +603,9 @@ `(rpm-spec-var-face ((,class (:foreground ,red)))) ;; sh-mode - `(sh-quoted-exec ((,class (:foreground ,violet :weigth bold)))) - `(sh-escaped-newline ((,class (:foreground ,yellow :weigth bold)))) - `(sh-heredoc ((,class (:foreground ,yellow :weigth bold)))) + `(sh-quoted-exec ((,class (:foreground ,violet :weight bold)))) + `(sh-escaped-newline ((,class (:foreground ,yellow :weight bold)))) + `(sh-heredoc ((,class (:foreground ,yellow :weight bold)))) ;; show-paren `(show-paren-match