solarized-emacs

commit aa0db96b486ac6df7461e1bc4399e313eaa6335c
parent e854bc079bfee1e9041d70d7f505948d15b582e2
Author: Thomas Frössman <thomasf@jossystem.se>
Date:   Wed, 19 Nov 2014 03:45:24 +0100

Merge pull request #138 from andersjohansson/avoid-org-headline-scaling-option

Add option solarized-scale-org-headlines
Diffstat:
M
README.md
 | 
11
+++++++++++
M
solarized.el
 | 
33
+++++++++++++++++++++------------

2 files changed, 32 insertions(+), 12 deletions(-)
diff --git a/README.md b/README.md
@@ -50,6 +50,17 @@ elisp code:
 
 ;; Use less colors for indicators such as git:gutter, flycheck and similar.
 (setq solarized-emphasize-indicators nil)
+
+;; Don't change size of org-mode headlines (but keep other size-changes)
+(setq solarized-scale-org-headlines nil)
+
+;; Avoid all font-size changes
+(setq solarized-height-minus-1 1)
+(setq solarized-height-plus-1 1)
+(setq solarized-height-plus-2 1)
+(setq solarized-height-plus-3 1)
+(setq solarized-height-plus-4 1)
+
 ```
 
 Note that these need to be set **before** `load-theme` is invoked for Solarized.
diff --git a/solarized.el b/solarized.el
@@ -106,6 +106,11 @@ Also affects `linum-mode' background."
   :type 'number
   :group 'solarized)
 
+(defcustom solarized-scale-org-headlines t
+  "Whether scaling of outline-headlines should apply to org-mode headlines."
+  :type 'boolean
+  :group 'solarized)
+
 (defun solarized-color-name-to-rgb (color &optional frame)
   "Convert COLOR string to a list of normalized RGB components.
 COLOR should be a color name (e.g. \"white\") or an RGB triplet
@@ -1578,14 +1583,18 @@ customize the resulting theme."
      `(org-formula ((,class (:foreground ,yellow))))
      `(org-headline-done ((,class (:foreground ,green))))
      `(org-hide ((,class (:foreground ,base03))))
-     `(org-level-1 ((,class (:inherit ,s-variable-pitch :height ,solarized-height-plus-4
-                                      :foreground ,orange))))
-     `(org-level-2 ((,class (:inherit ,s-variable-pitch :height ,solarized-height-plus-3
-                                      :foreground ,green))))
-     `(org-level-3 ((,class (:inherit ,s-variable-pitch :height ,solarized-height-plus-2
-                                      :foreground ,blue))))
-     `(org-level-4 ((,class (:inherit ,s-variable-pitch :height ,solarized-height-plus-1
-                                      :foreground ,yellow))))
+     `(org-level-1 ((,class (:inherit ,s-variable-pitch :foreground ,orange
+                             ,@(when solarized-scale-org-headlines
+                                 (list :height ,solarized-height-plus-4))))))
+     `(org-level-2 ((,class (:inherit ,s-variable-pitch :foreground ,green
+                             ,@(when solarized-scale-org-headlines
+                                 (list :height ,solarized-height-plus-3))))))
+     `(org-level-3 ((,class (:inherit ,s-variable-pitch :foreground ,blue
+                             ,@(when solarized-scale-org-headlines
+                                 (list :height ,solarized-height-plus-2))))))
+     `(org-level-4 ((,class (:inherit ,s-variable-pitch :foreground ,yellow
+                             ,@(when solarized-scale-org-headlines
+                                 (list :height ,solarized-height-plus-1))))))
      `(org-level-5 ((,class (:inherit ,s-variable-pitch
                                       :foreground ,cyan))))
      `(org-level-6 ((,class (:inherit ,s-variable-pitch
@@ -1632,10 +1641,10 @@ customize the resulting theme."
 
      
      ;; outline
-     `(outline-1 ((,class (:inherit org-level-1))))
-     `(outline-2 ((,class (:inherit org-level-2))))
-     `(outline-3 ((,class (:inherit org-level-3))))
-     `(outline-4 ((,class (:inherit org-level-4))))
+     `(outline-1 ((,class (:inherit org-level-1 :height ,solarized-height-plus-4))))
+     `(outline-2 ((,class (:inherit org-level-2 :height ,solarized-height-plus-3))))
+     `(outline-3 ((,class (:inherit org-level-3 :height ,solarized-height-plus-2))))
+     `(outline-4 ((,class (:inherit org-level-4 :height ,solarized-height-plus-1))))
      `(outline-5 ((,class (:inherit org-level-5))))
      `(outline-6 ((,class (:inherit org-level-6))))
      `(outline-7 ((,class (:inherit org-level-7))))