[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] master 2670a39 3/3: Merge commit 'f4163526c6f603b9dea1d8a3253d31c
From: |
Matthew Carter |
Subject: |
[elpa] master 2670a39 3/3: Merge commit 'f4163526c6f603b9dea1d8a3253d31c135fd8876' |
Date: |
Tue, 17 May 2016 04:00:09 +0000 (UTC) |
branch: master
commit 2670a396603bf44935e8ff1d3d2dead43c9e4c3c
Merge: 1a3ec40 f416352
Author: Matthew Carter <address@hidden>
Commit: Matthew Carter <address@hidden>
Merge commit 'f4163526c6f603b9dea1d8a3253d31c135fd8876'
---
packages/ahungry-theme/README.md | 5 +++++
packages/ahungry-theme/ahungry-theme.el | 36 +++++++++++++++++++++++++------
2 files changed, 34 insertions(+), 7 deletions(-)
diff --git a/packages/ahungry-theme/README.md b/packages/ahungry-theme/README.md
index 805f451..0543b09 100644
--- a/packages/ahungry-theme/README.md
+++ b/packages/ahungry-theme/README.md
@@ -17,6 +17,11 @@ Then, make sure to add the following to your ~/.emacs:
### Using load-theme
```lisp
(add-to-list 'custom-theme-load-path "~/.emacs.d/color-theme-ahungry/")
+
+;; Only set this if you wish to retain your own font settings
+;; otherwise, leave it out.
+(setq ahungry-theme-font-settings nil)
+
(load-theme 'ahungry t)
```
the first time you load it, you will need to accept the theme.
diff --git a/packages/ahungry-theme/ahungry-theme.el
b/packages/ahungry-theme/ahungry-theme.el
index 98deaf0..f382de6 100644
--- a/packages/ahungry-theme/ahungry-theme.el
+++ b/packages/ahungry-theme/ahungry-theme.el
@@ -5,7 +5,7 @@
;; Author: Matthew Carter <address@hidden>
;; Maintainer: Matthew Carter <address@hidden>
;; URL: https://github.com/ahungry/color-theme-ahungry
-;; Version: 1.1.0
+;; Version: 1.2.0
;; Keywords: ahungry palette color theme emacs color-theme deftheme
;; Package-Requires: ((emacs "24"))
@@ -36,6 +36,10 @@
;;; News:
+;;;; Changes since 1.1.0:
+;; - New variable ahungry-theme-font-settings to avoid overriding user font
sizes
+;; - Add info-mode faces
+
;;;; Changes since 1.0.12:
;; - Add erc/jabber faces to begin with
@@ -75,18 +79,28 @@
(deftheme ahungry
"Ahungry Theme")
+(defvar ahungry-theme-font-settings
+ '(:family "Terminus" :foundry "xos4"
+ :slant normal :weight normal
+ :height 100 :width normal)
+ "If set to nil, will avoid overriding the user font settings.
+Leave this alone to retain defaults.
+
+Default value:
+ '(:family \"Terminus\" :foundry \"xos4\"
+ :slant normal :weight normal
+ :height 100 :width normal)")
+
(let ((mainbg (when (display-graphic-p) "#222222")));; "default")))
(custom-theme-set-faces
'ahungry ;; This is the theme name
`(default ((t (:foreground "#ffffff" :background ,mainbg
- :family "Terminus" :foundry "xos4"
- :slant normal :weight normal
- :height 100 :width normal))))
+ ,@ahungry-theme-font-settings))))
'(cursor ((t (:background "#fce94f" :foreground "#ffffff"))))
'(highlight ((t (:background "brown4" :foreground nil))))
'(border ((t (:background "#888a85"))))
'(fringe ((t (:background "#333333"))))
- '(mode-line ((t (:foreground "#0022ff" :bold t :background "#77ff00"
+ '(mode-line ((t (:foreground "#0022aa" :bold t :background "#77ff00"
:box (:line-width 1 :color nil :style
released-button)))))
'(mode-line-inactive ((t (:foreground "#444444" :background "#66ff33"))))
'(mode-line-buffer-id ((t (:bold t :foreground "#ffffff" :background
"#0055ff"))))
@@ -129,8 +143,6 @@
'(isearch-lazy-highlight-face ((t (:foreground "#2e3436" :background
"#ff6600"))))
'(show-paren-match-face ((t (:background "#ff6600" :foreground "#2e3436"))))
'(show-paren-mismatch-face ((t (:background "#999999" :foreground
"#ff6600"))))
- '(info-xref ((t (:foreground "#33ffbb"))))
- '(info-xref-visited ((t (:foreground "#999999"))))
'(diary ((t (:bold t :foreground "#ff0000"))))
'(message-cited-text ((t (:foreground "#ffc800"))))
'(gnus-cite-1 ((t (:foreground "#999999"))))
@@ -240,6 +252,16 @@
'(jabber-chat-prompt-foreign ((t (:foreground "#ff0099"))))
'(jabber-chat-prompt-local ((t (:foreground "#0099ff"))))
'(jabber-rare-time-face ((t (:foreground "#666666" :bold nil :italic t))))
+ '(eshell-prompt ((t (:foreground "#0099ff"))))
+ '(info-menu-header ((t (:foreground "#0099ff" :bold t :underline t))))
+ '(info-header-xref ((t (:foreground "#0099ff"))))
+ '(info-header-node ((t (:foreground "#ff0099" :bold t :italic t))))
+ '(info-menu-star ((t (:foreground "#0099ff" :bold t))))
+ '(info-xref-visited ((t (:foreground "#999999"))))
+ '(info-xref ((t (:foreground "#0099ff"))))
+ '(info-node ((t (:foreground "#ff0099"))))
+ '(info-title-1 ((t (:foreground "yellow" :bold t))))
+ '(info-title-2 ((t (:foreground "#ff0099"))))
)
(custom-theme-set-variables
'ahungry