emacs
/
emacs-color-theme-solarized
mirror of https://github.com/sellout/emacs-color-theme-solarized.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge branch 'master' into lewang-master 

Conflicts:
	solarized-definitions.el
This commit is contained in:
Le Wang 2013-03-28 21:23:36 +08:00
parent d6b2895a1e ec7dc87285
commit 70ccde6234
2 changed files with 30 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
README.md
View File

@ -33,7 +33,7 @@ Installation & Usage
### Emacs 24
1. Add the `emacs-color-theme-solarized` directory to your Emacs `custom-theme-load-path`.
1. Add the `emacs-color-theme-solarized` directory to your Emacs `custom-theme-load-path`, or install from marmalade using `package-install color-theme-solarized`
2. Add `(load-theme 'solarized-[light|dark] t)` to your Emacs init file.
3. Reload the init file, or restart Emacs.
@ -167,7 +167,10 @@ Here are some things to keep in mind when submitting a bug report:
* include the output of `M-x version` in your report,
* mention whether you’re using color-theme or the Emacs 24 theme,
* include the names of Emacs faces that you have a problem with (`M-x describe-face` will tell you the name of the face at point),
* include the names of Emacs faces that you have a problem with (`M-: (face-at-point)` and `M-x describe-face` will tell you the name of the face at point),
* include the output of `M-: (display-color-cells)` (that lets us know which set of colors your Emacs is using),
* screenshots are very helpful (before and after if you made a change),
* if you’re using a terminal, the name of the terminal and (if you can find out) the number of colors the terminal app is using,
* also if you’re using a terminal, try running Emacs in GUI mode, and see if the problem exists there (if it does, report the bug that way, if not, just mention that it’s a terminal-only bug),
* it’s very helpful (but not expected) if you can compare it to a similar situation in VIM (especially if you know the VIM highlight name or have a screenshot), and
* `M-x customize-apropos-faces` can help you find all the relevant faces if you are submitting faces for a mode.

26
solarized-definitions.el
View File

@ -383,6 +383,9 @@ the \"Gen RGB\" column in solarized-definitions.el to improve them further."
(widget-single-line-field ((t (:inherit widget-field))))
;; extra modules
;; -------------
;; bm visual bookmarks
(bm-fringe-face ((t (,@bg-orange ,@fg-base03))))
(bm-fringe-persistent-face ((t (,@bg-blue ,@fg-base03))))
;; Flymake
(flymake-errline ((t (,@fmt-revr ,@fg-red ,@bg-back)))) ; ErrorMsg
(flymake-warnline ; WarningMsg
@ -408,6 +411,10 @@ the \"Gen RGB\" column in solarized-definitions.el to improve them further."
(jabber-roster-user-offline ((t (,@fg-base01))))
(jabber-roster-user-online ((t (,@fmt-bold ,@fg-blue))))
(jabber-roster-user-xa ((t (,@fmt-ital ,@fg-magenta))))
;; git-gutter
(git-gutter:modified ((t (,@fg-violet))))
(git-gutter:added ((t (,@fg-green))))
(git-gutter:deleted ((t (,@fg-red))))
;; gnus - these are taken from mutt, not VIM
(gnus-cite-1 ((t (,@fmt-none ,@fg-blue)))) ; quoted
(gnus-cite-2 ((t (,@fmt-none ,@fg-cyan)))) ; quoted1
@ -532,18 +539,35 @@ the \"Gen RGB\" column in solarized-definitions.el to improve them further."
(rcirc-bright-nick ((t (:foreground ,magenta))))
(rcirc-server ((t (:foreground ,base1))))
(rcirc-timestamp ((t (:foreground ,base01))))
;; ERC
(erc-input-face ((t (:foreground ,base01))))
(erc-keyword-face ((t (,@fmt-bldi ,@fg-yellow))))
(erc-my-nick-face ((t (:foreground ,blue))))
(erc-nick-default-face ((t (,@fmt-none ,@fg-cyan))))
(erc-notice-face ((t (,@fmt-none ,@fg-blue))))
(erc-timestamp-face ((t (:foreground ,base01))))
;;font-latex
(font-latex-warning-face ((t (,@fg-red))))
(font-latex-sectioning-5-face ((t (,@fg-violet))))
;;flyspell
(flyspell-incorrect ((t (,@fg-red))))
(flyspell-duplicate ((t (,@fg-yellow)))))
(flyspell-duplicate ((t (,@fg-yellow))))
;;ansi-term
(term-color-black ((t ( ,@fg-base02))))
(term-color-red ((t ( ,@fg-red))))
(term-color-green ((t ( ,@fg-green))))
(term-color-yellow ((t ( ,@fg-yellow))))
(term-color-blue ((t ( ,@fg-blue))))
(term-color-magenta ((t ( ,@fg-magenta))))
(term-color-cyan ((t ( ,@fg-cyan))))
(term-color-white ((t ( ,@fg-base00)))))
((foreground-color . ,(when (<= 16 (display-color-cells)) base0))
(background-color . ,back)
(background-mode . ,mode)
(cursor-color . ,(when (<= 16 (display-color-cells))
base0))
(ansi-color-names-vector . [,base02 ,red ,green ,yellow ,blue ,magenta ,cyan ,base00])
(compilation-message-face . nil))))))))
(defmacro create-solarized-theme (mode)