Add new ahungry-theme-font-settings variable

This allows prevention of overriding user font size/font family in the theme.

diff --git a/README.md b/README.md
index 805f451ed7895498ee0debc5dc3d1a5415092206..0543b09e98037ac0382fed08bd12ab4bac0e270f 100644 (file)
--- a/README.md
+++ b/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/ahungry-theme.el b/ahungry-theme.el
index 2356807edf8d0efcbbfc0490d1ed82c21c2e6d71..97ee3258909e8ee18ed745865cb13709eb872743 100644 (file)
--- a/ahungry-theme.el
+++ b/ahungry-theme.el
@@ -5,7 +5,7 @@
 ;; Author: Matthew Carter <m@ahungry.com>
 ;; Maintainer: Matthew Carter <m@ahungry.com>
 ;; 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,13 +79,23 @@
 (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"))))
@@ -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