branch: master
commit 65ee800e15fc9b04a70c2903f7a4620da40205cd
Author: Matthew Carter <m...@ahungry.com>
Commit: Matthew Carter <m...@ahungry.com>
Merge in changes from GNU Elpa subtree
None of the subtree commands seem to properly merge subtree back
upstream into the repository, so manually handle it here.
* Fix some quoting problems in doc strings
* packages/ahungry-theme/ahungry-theme.el: Use lexical-binding.
* color-theme-ahungry.el: Don't burp if color-theme is missing
---
ahungry-theme.el | 4 ++--
color-theme-ahungry.el | 3 +--
2 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/ahungry-theme.el b/ahungry-theme.el
index 7d10791..3b35f59 100644
--- a/ahungry-theme.el
+++ b/ahungry-theme.el
@@ -1,4 +1,4 @@
-;;; ahungry-theme.el --- Ahungry color theme for Emacs. Make sure to
(load-theme 'ahungry).
+;;; ahungry-theme.el --- Ahungry color theme for Emacs. Make sure to
(load-theme 'ahungry). -*- lexical-binding:t -*-
;; Copyright (C) 2015,2016 Free Software Foundation, Inc.
@@ -87,7 +87,7 @@
Leave this alone to retain defaults.
Default value:
- '(:family \"Terminus\" :foundry \"xos4\"
+ (:family \"Terminus\" :foundry \"xos4\"
:slant normal :weight normal
:height 100 :width normal)")
diff --git a/color-theme-ahungry.el b/color-theme-ahungry.el
index e9ded6e..14980d8 100644
--- a/color-theme-ahungry.el
+++ b/color-theme-ahungry.el
@@ -36,8 +36,7 @@
;;; Code:
-(eval-when-compile
- (require 'color-theme))
+(declare-function color-theme-install "color-theme" (theme))
;; Currently background-color and foreground-color are intentionally left
;; commented out, so that the color-theme in terminal mode will not overwrite
