summaryrefslogtreecommitdiffhomepage
path: root/lib
diff options
context:
space:
mode:
Diffstat (limited to 'lib')
-rw-r--r--lib/doc/jao-mac.el2
-rw-r--r--lib/doc/jao-org-focus.el9
-rw-r--r--lib/doc/jao-pdf.el3
3 files changed, 6 insertions, 8 deletions
diff --git a/lib/doc/jao-mac.el b/lib/doc/jao-mac.el
index 96da735..cb16752 100644
--- a/lib/doc/jao-mac.el
+++ b/lib/doc/jao-mac.el
@@ -196,7 +196,7 @@
(defun jao-devon-open (file &optional page height)
(let ((url (jao-devon-find-url file)))
(if (string-empty-p (or url ""))
- (let ((jao-browse-doc-use-emacs t))
+ (let ((jao-pdf-open-in-emacs t))
(jao-find-or-open file page height))
(let* ((p (if page (format "?page=%s" (- page 1)) ""))
(u (format "%s%s" url p)))
diff --git a/lib/doc/jao-org-focus.el b/lib/doc/jao-org-focus.el
index 13f1201..e9d6ed2 100644
--- a/lib/doc/jao-org-focus.el
+++ b/lib/doc/jao-org-focus.el
@@ -18,16 +18,12 @@
;; You should have received a copy of the GNU General Public License
;; along with this program. If not, see <https://www.gnu.org/licenses/>.
-;;; Commentary:
-
-;; Miscellanous utilities for working with org files
-
(require 'org)
-;;; focus on subtree
(defvar-local jao-org-focus--parent nil)
(defvar-local jao-org-focus--section nil)
+;;; focus on subtree
(defun jao-org-focus ()
"Pop creatingly to an indirect buffer focused on the encloing subtree.
@@ -46,6 +42,7 @@ When invoked on an indirect buffer, pops back to its base."
(if-let* ((b (get-buffer bname)))
(pop-to-buffer b)
(clone-indirect-buffer bname t)
+ (org-focus-mode -1)
(org-focus-child-mode)
(setq jao-org-focus--parent parent
jao-org-focus--section title)
@@ -117,4 +114,4 @@ With arg, offer to switch to all children, regardless of their parent."
:keymap org-focus-mode-map)
(provide 'jao-org-focus)
-;;; jao-org.el ends here
+;;; jao-org-focus.el ends here
diff --git a/lib/doc/jao-pdf.el b/lib/doc/jao-pdf.el
index fc332ab..162cd9a 100644
--- a/lib/doc/jao-pdf.el
+++ b/lib/doc/jao-pdf.el
@@ -125,9 +125,10 @@
(user-error "Skim is not viewing any docs!"))))
;;; Open doc functions
+(defvar jao-pdf-open-in-emacs t)
(defun jao-find-or-open (file &optional page height)
- (cond ((and jao-browse-doc-use-emacs window-system)
+ (cond ((and jao-pdf-open-in-emacs window-system)
(let* ((buffs (buffer-list))
(b (catch 'done
(while buffs