branch: externals/auto-overlays
commit e6e8a76eee0b2ac0fd48cc6ce5cd5cf464d12fe6
Author: Toby S. Cubitt <[email protected]>
Commit: Toby S. Cubitt <[email protected]>
Fix auto-overlay package loading so requiring auto-overlayys pulls in all
standard classes.
---
auto-overlay-flat.el | 2 +-
auto-overlay-line.el | 2 +-
auto-overlay-nested.el | 2 +-
auto-overlay-self.el | 3 ++-
auto-overlay-word.el | 2 +-
auto-overlays.el | 12 ++++++++++--
6 files changed, 16 insertions(+), 7 deletions(-)
diff --git a/auto-overlay-flat.el b/auto-overlay-flat.el
index 9d9eb44..cf1d37f 100644
--- a/auto-overlay-flat.el
+++ b/auto-overlay-flat.el
@@ -26,8 +26,8 @@
;;; Code:
-(require 'auto-overlays)
(provide 'auto-overlay-flat)
+(require 'auto-overlays)
;; set flat overlay parsing and suicide functions, and indicate class requires
diff --git a/auto-overlay-line.el b/auto-overlay-line.el
index 0241e97..fd0dc4e 100644
--- a/auto-overlay-line.el
+++ b/auto-overlay-line.el
@@ -26,8 +26,8 @@
;;; Code:
-(require 'auto-overlays)
(provide 'auto-overlay-line)
+(require 'auto-overlays)
;; set line overlay parsing and suicide funtions
diff --git a/auto-overlay-nested.el b/auto-overlay-nested.el
index 5d5fc72..f64f287 100644
--- a/auto-overlay-nested.el
+++ b/auto-overlay-nested.el
@@ -26,8 +26,8 @@
;;; Code:
-(require 'auto-overlays)
(provide 'auto-overlay-nested)
+(require 'auto-overlays)
;; set nested overlay parsing and suicide functions, and indicate class
diff --git a/auto-overlay-self.el b/auto-overlay-self.el
index d7d29b5..19df8a7 100644
--- a/auto-overlay-self.el
+++ b/auto-overlay-self.el
@@ -26,8 +26,9 @@
;;; Code:
-(require 'auto-overlays)
(provide 'auto-overlay-self)
+(require 'auto-overlays)
+
(defvar auto-o-pending-self-cascade nil)
(make-variable-buffer-local 'auto-o-pending-self-cascade)
diff --git a/auto-overlay-word.el b/auto-overlay-word.el
index 59c81a0..f3471d0 100644
--- a/auto-overlay-word.el
+++ b/auto-overlay-word.el
@@ -26,8 +26,8 @@
;;; Code:
-(require 'auto-overlays)
(provide 'auto-overlay-word)
+(require 'auto-overlays)
;; set word overlay parsing and suicide functions
diff --git a/auto-overlays.el b/auto-overlays.el
index 9e6d318..9c165cb 100644
--- a/auto-overlays.el
+++ b/auto-overlays.el
@@ -33,9 +33,7 @@
(defvar auto-overlay-load-hook nil)
(defvar auto-overlay-unload-hook nil)
-
(eval-when-compile (require 'cl))
-(provide 'auto-overlays)
;; (defvar auto-overlay-list nil)
@@ -2117,4 +2115,14 @@ overlay changes."
nil))
+
+(provide 'auto-overlays)
+
+(require 'auto-overlay-word)
+(require 'auto-overlay-line)
+(require 'auto-overlay-self)
+(require 'auto-overlay-nested)
+(require 'auto-overlay-flat)
+
+
;;; auto-overlays.el ends here