Merge commit '3843afc1e499123bea752c925a4c0d0b7167b8a7'

diff --git a/packages/ahungry-theme/ahungry-theme-autoloads.el b/packages/ahungry-theme/ahungry-theme-autoloads.el
deleted file mode 100644 (file)
index 36923e1..0000000
--- a/packages/ahungry-theme/ahungry-theme-autoloads.el
+++ /dev/null
@@ -1,18 +0,0 @@
-;;; ahungry-theme-autoloads.el --- automatically extracted autoloads
-;;
-;;; Code:
-(add-to-list 'load-path (or (file-name-directory #$) (car load-path)))
-(when (boundp 'custom-theme-load-path)
-  (add-to-list 'custom-theme-load-path (or (file-name-directory #$) (car load-path))))
-\f
-;;;### (autoloads nil nil ("ahungry-theme-pkg.el" "ahungry-theme.el"
-;;;;;;  "color-theme-ahungry.el") (21716 20244 379937 516000))
-
-;;;***
-\f
-;; Local Variables:
-;; version-control: never
-;; no-byte-compile: t
-;; no-update-autoloads: t
-;; End:
-;;; ahungry-theme-autoloads.el ends here

diff --git a/packages/ahungry-theme/ahungry-theme.el b/packages/ahungry-theme/ahungry-theme.el
index 5ed8ffe50a09cc07b3e4cf236f6201d3e81a0f60..a5457e2e637541a0137fab9f6fee5553f76cf75a 100644 (file)
--- a/packages/ahungry-theme/ahungry-theme.el
+++ b/packages/ahungry-theme/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.0.4
+;; Version: 1.0.5
 ;; Keywords: ahungry palette color theme emacs color-theme deftheme
 ;; Package-Requires: ((emacs "24"))
 
@@ -36,6 +36,9 @@
 
 ;;; News:
 
+;;;; Changes since 1.0.4:
+;; - Don't circumvent normal autoloads functionality, use the comment load method
+
 ;;;; Changes since 1.0.3:
 ;; - Manually include an autoloads file to make sure
 ;;   custom-theme-load-path is filled out
@@ -186,6 +189,12 @@
    '(red "#ffffff"))
   )
 
+;;;###autoload
+(when (and load-file-name (boundp 'custom-theme-load-path))
+ (add-to-list
+      'custom-theme-load-path
+      (file-name-as-directory (file-name-directory load-file-name))))
+
 (provide-theme 'ahungry)
 
 ;;; ahungry-theme.el ends here