org-focus fixesmain

1 files changed, 9 insertions, 6 deletions

diff --git a/lib/doc/jao-org-focus.el b/lib/doc/jao-org-focus.el
index 859cb65..0d0b02b 100644
--- a/lib/doc/jao-org-focus.el
+++ b/lib/doc/jao-org-focus.el
@@ -43,6 +43,7 @@
          (link (format "[[%s::*%s]]" file title)))
     (org-link-open-from-string link)))
 
+;;;###autoload
 (defun jao-org-focus-jump-to-sibling ()
   (interactive)
   (when-let* ((title (save-excursion (jao-org-focus--header-title)))
@@ -113,6 +114,7 @@ sync."
 
 (defvar jao-org-focus--focused-history nil)
 
+;;;###autoload
 (defun jao-org-focus-switch (arg)
   "Read with completion a focused child and pop to it.
 
@@ -124,11 +126,13 @@ With arg, offer to switch to all children, regardless of their parent."
      (completing-read "Focused child: " fl
                       nil t nil 'jao-org-focus--focused-history))))
 
+;;;###autoload
 (defun jao-org-focus-goto-line (n)
   (interactive "NGo to line: ")
   (goto-char (point-min))
   (forward-visible-line n))
 
+;;;###autoload
 (define-minor-mode org-focus-mode
   "A mode where keeping track of focused children is on by default."
   :lighter " ◎"
@@ -141,20 +145,19 @@ With arg, offer to switch to all children, regardless of their parent."
       (add-hook 'after-save-hook #'jao-org-focus-redisplay-children nil t)
     (remove-hook 'after-save-hook #'jao-org-focus-redisplay-children t)))
 
+;;;###autoload
 (define-minor-mode org-focus-child-mode
   "A mode for the children of a focused org buffer."
   :lighter " ◉"
+  :keymap (let ((map (make-keymap)))
+            (suppress-keymap map)
+            (keymap-set map "<remap> <goto-line>" #'jao-org-focus-goto-line)
+            map)
   (when (and org-focus-child-mode (require 'symbol-overlay nil t))
     (face-remap-reset-base 'symbol-overlay-default-face)
     (face-remap-add-relative 'symbol-overlay-default-face 'warning 'underline)
     (symbol-overlay-mode 1)))
 
-(set-keymap-parent org-focus-child-mode-map org-focus-mode)
-(keymap-set org-focus-child-mode-map
-            "<remap> <goto-line>"
-            #'jao-org-focus-goto-line)
-
-
 (with-eval-after-load 'symbol-overlay
   (keymap-set org-focus-mode-map "M-n" 'symbol-overlay-jump-next)
   (keymap-set org-focus-mode-map "M-p" 'symbol-overlay-jump-prev))