From 423a38c758bbea0fe4984de743a4bb6cc683e0c9 Mon Sep 17 00:00:00 2001
From: Henrik Lissner <henrik@lissner.net>
Date: Fri, 4 Oct 2019 12:17:47 -0400
Subject: [PATCH] lang/org: move contrib/+hugo -> contrib/hugo

+ Refill +hugo flag's description in the README
+ Lazy load ox-hugo localleader keybinds by package, rather than by
  keymap deferral
---
 modules/lang/org/README.org                    | 4 ++--
 modules/lang/org/config.el                     | 2 +-
 modules/lang/org/contrib/{+hugo.el => hugo.el} | 5 ++---
 3 files changed, 5 insertions(+), 6 deletions(-)
 rename modules/lang/org/contrib/{+hugo.el => hugo.el} (94%)

diff --git a/modules/lang/org/README.org b/modules/lang/org/README.org
index cf5462afdcd..9fa6a7bdfa5 100644
--- a/modules/lang/org/README.org
+++ b/modules/lang/org/README.org
@@ -61,8 +61,8 @@ https://www.mfoot.com/blog/2015/11/22/literate-emacs-configuration-with-org-mode
 + =+pandoc= Enables pandoc integration into the Org exporter.
 + =+present= Enables integration with reveal.js, beamer and org-tree-slide, so
   Emacs can be used for presentations.
-+ =+hugo= Enables integration with [[https://gohugo.io][hugo]] to export from
-  Emacs well-formed ([[https://github.com/russross/blackfriday][blackfriday]]) markdown.
++ =+hugo= Enables integration with [[https://gohugo.io][hugo]] to export from Emacs well-formed
+  ([[https://github.com/russross/blackfriday][blackfriday]]) markdown.
 
 ** Plugins
 + [[https://orgmode.org/][org-plus-contrib]]
diff --git a/modules/lang/org/config.el b/modules/lang/org/config.el
index bb7856ef1b2..4c951e72df3 100644
--- a/modules/lang/org/config.el
+++ b/modules/lang/org/config.el
@@ -868,7 +868,7 @@ compelling reason, so..."
 
   ;;; Custom org modules
   (if (featurep! +dragndrop) (load! "contrib/dragndrop"))
-  (if (featurep! +hugo)      (load! "contrib/+hugo"))
+  (if (featurep! +hugo)      (load! "contrib/hugo"))
   (if (featurep! +ipython)   (load! "contrib/ipython"))
   (if (featurep! +present)   (load! "contrib/present"))
 
diff --git a/modules/lang/org/contrib/+hugo.el b/modules/lang/org/contrib/hugo.el
similarity index 94%
rename from modules/lang/org/contrib/+hugo.el
rename to modules/lang/org/contrib/hugo.el
index da689afc24b..c466be33986 100644
--- a/modules/lang/org/contrib/+hugo.el
+++ b/modules/lang/org/contrib/hugo.el
@@ -4,7 +4,8 @@
 (use-package! ox-hugo
   :after ox
   :preface
-  (map! :map org-mode-map
+  (map! :after org
+        :map org-mode-map
         :localleader
         (:prefix "e"
           (:prefix ("H" . "hugo")
@@ -14,5 +15,3 @@
             :desc "File to Md file & open"               "o" (λ! (org-open-file (org-hugo-export-to-md)))
             :desc "All subtrees (or File) to Md file(s)" "A" (λ! (org-hugo-export-wim-to-md :all-subtrees))
             :desc "File to a temporary Md buffer"        "t" #'org-hugo-export-as-md))))
-
-;;; +hugo.el ends here