From 551ff3b17e2d1a4a77704fec4034e638a19739d9 Mon Sep 17 00:00:00 2001 From: Jonas Bernoulli Date: Tue, 18 Feb 2025 01:00:59 +0100 Subject: [PATCH] Use org-fold-show-context instead of obsolete function alias To avoid having to create a wrapper function and silence the byte- compiler for both when using a pre-rename and post-rename Org, keep it simple and just depend on Org 9.6. --- extensions/org-roam-export.el | 2 +- extensions/org-roam-graph.el | 2 +- extensions/org-roam-overlay.el | 2 +- extensions/org-roam-protocol.el | 2 +- org-roam-capture.el | 2 +- org-roam-db.el | 2 +- org-roam-id.el | 2 +- org-roam-log.el | 2 +- org-roam-migrate.el | 2 +- org-roam-mode.el | 6 +++--- org-roam-node.el | 4 ++-- org-roam-utils.el | 2 +- org-roam.el | 2 +- 13 files changed, 16 insertions(+), 16 deletions(-) diff --git a/extensions/org-roam-export.el b/extensions/org-roam-export.el index 4e39f90..c2192e2 100644 --- a/extensions/org-roam-export.el +++ b/extensions/org-roam-export.el @@ -6,7 +6,7 @@ ;; URL: https://github.com/org-roam/org-roam ;; Keywords: org-mode, roam, convenience ;; Version: 2.2.2 -;; Package-Requires: ((emacs "26.1") (org "9.4") (org-roam "2.1")) +;; Package-Requires: ((emacs "26.1") (org "9.6") (org-roam "2.1")) ;; This file is NOT part of GNU Emacs. diff --git a/extensions/org-roam-graph.el b/extensions/org-roam-graph.el index dde693c..c3176f6 100644 --- a/extensions/org-roam-graph.el +++ b/extensions/org-roam-graph.el @@ -6,7 +6,7 @@ ;; URL: https://github.com/org-roam/org-roam ;; Keywords: org-mode, roam, convenience ;; Version: 2.2.2 -;; Package-Requires: ((emacs "26.1") (org "9.4") (org-roam "2.1")) +;; Package-Requires: ((emacs "26.1") (org "9.6") (org-roam "2.1")) ;; This file is NOT part of GNU Emacs. diff --git a/extensions/org-roam-overlay.el b/extensions/org-roam-overlay.el index f17bed6..1a7516e 100644 --- a/extensions/org-roam-overlay.el +++ b/extensions/org-roam-overlay.el @@ -6,7 +6,7 @@ ;; URL: https://github.com/org-roam/org-roam ;; Keywords: org-mode, roam, convenience ;; Version: 2.2.2 -;; Package-Requires: ((emacs "26.1") (org "9.4") (org-roam "2.1")) +;; Package-Requires: ((emacs "26.1") (org "9.6") (org-roam "2.1")) ;; This file is NOT part of GNU Emacs. diff --git a/extensions/org-roam-protocol.el b/extensions/org-roam-protocol.el index a705e12..c1df9bd 100644 --- a/extensions/org-roam-protocol.el +++ b/extensions/org-roam-protocol.el @@ -5,7 +5,7 @@ ;; URL: https://github.com/org-roam/org-roam ;; Keywords: org-mode, roam, convenience ;; Version: 2.2.2 -;; Package-Requires: ((emacs "26.1") (org "9.4") (org-roam "2.1")) +;; Package-Requires: ((emacs "26.1") (org "9.6") (org-roam "2.1")) ;; This file is NOT part of GNU Emacs. diff --git a/org-roam-capture.el b/org-roam-capture.el index e34f6e7..5f27bb8 100644 --- a/org-roam-capture.el +++ b/org-roam-capture.el @@ -6,7 +6,7 @@ ;; URL: https://github.com/org-roam/org-roam ;; Keywords: org-mode, roam, convenience ;; Version: 2.2.2 -;; Package-Requires: ((emacs "26.1") (dash "2.13") (org "9.4") (emacsql "4.1.0") (magit-section "3.0.0")) +;; Package-Requires: ((emacs "26.1") (dash "2.13") (org "9.6") (emacsql "4.1.0") (magit-section "3.0.0")) ;; This file is NOT part of GNU Emacs. diff --git a/org-roam-db.el b/org-roam-db.el index 9176014..70903d1 100644 --- a/org-roam-db.el +++ b/org-roam-db.el @@ -6,7 +6,7 @@ ;; URL: https://github.com/org-roam/org-roam ;; Keywords: org-mode, roam, convenience ;; Version: 2.2.2 -;; Package-Requires: ((emacs "26.1") (dash "2.13") (org "9.4") (emacsql "4.1.0") (magit-section "3.0.0")) +;; Package-Requires: ((emacs "26.1") (dash "2.13") (org "9.6") (emacsql "4.1.0") (magit-section "3.0.0")) ;; This file is NOT part of GNU Emacs. diff --git a/org-roam-id.el b/org-roam-id.el index e736780..f71121c 100644 --- a/org-roam-id.el +++ b/org-roam-id.el @@ -6,7 +6,7 @@ ;; URL: https://github.com/org-roam/org-roam ;; Keywords: org-mode, roam, convenience ;; Version: 2.2.2 -;; Package-Requires: ((emacs "26.1") (dash "2.13") (org "9.4") (magit-section "3.0.0")) +;; Package-Requires: ((emacs "26.1") (dash "2.13") (org "9.6") (magit-section "3.0.0")) ;; This file is NOT part of GNU Emacs. diff --git a/org-roam-log.el b/org-roam-log.el index 6ffb4bd..c751597 100644 --- a/org-roam-log.el +++ b/org-roam-log.el @@ -6,7 +6,7 @@ ;; URL: https://github.com/org-roam/org-roam ;; Keywords: org-mode, roam, convenience ;; Version: 2.2.2 -;; Package-Requires: ((emacs "26.1") (dash "2.13") (org "9.4") (emacsql "4.1.0") (magit-section "3.0.0")) +;; Package-Requires: ((emacs "26.1") (dash "2.13") (org "9.6") (emacsql "4.1.0") (magit-section "3.0.0")) ;; This file is NOT part of GNU Emacs. diff --git a/org-roam-migrate.el b/org-roam-migrate.el index 30d0e8f..5b55f4e 100644 --- a/org-roam-migrate.el +++ b/org-roam-migrate.el @@ -6,7 +6,7 @@ ;; URL: https://github.com/org-roam/org-roam ;; Keywords: org-mode, roam, convenience ;; Version: 2.2.2 -;; Package-Requires: ((emacs "26.1") (dash "2.13") (org "9.4") (emacsql "4.1.0") (magit-section "3.0.0")) +;; Package-Requires: ((emacs "26.1") (dash "2.13") (org "9.6") (emacsql "4.1.0") (magit-section "3.0.0")) ;; This file is NOT part of GNU Emacs. diff --git a/org-roam-mode.el b/org-roam-mode.el index b31ab21..7faf40f 100644 --- a/org-roam-mode.el +++ b/org-roam-mode.el @@ -6,7 +6,7 @@ ;; URL: https://github.com/org-roam/org-roam ;; Keywords: org-mode, roam, convenience ;; Version: 2.2.2 -;; Package-Requires: ((emacs "26.1") (dash "2.13") (org "9.4") (emacsql "4.1.0") (magit-section "3.0.0")) +;; Package-Requires: ((emacs "26.1") (dash "2.13") (org "9.6") (emacsql "4.1.0") (magit-section "3.0.0")) ;; This file is NOT part of GNU Emacs. @@ -441,7 +441,7 @@ In interactive calls OTHER-WINDOW is set with (with-current-buffer buf (widen) (goto-char point)) - (when (org-invisible-p) (org-show-context)) + (when (org-invisible-p) (org-fold-show-context)) buf)) (defun org-roam-preview-default-function () @@ -630,7 +630,7 @@ instead." (forward-line (1- row))) (when col (forward-char (1- col)))) - (when (org-invisible-p) (org-show-context)) + (when (org-invisible-p) (org-fold-show-context)) buf)) ;;;; Unlinked references diff --git a/org-roam-node.el b/org-roam-node.el index 74748ef..9da7a6d 100644 --- a/org-roam-node.el +++ b/org-roam-node.el @@ -6,7 +6,7 @@ ;; URL: https://github.com/org-roam/org-roam ;; Keywords: org-mode, roam, convenience ;; Version: 2.2.2 -;; Package-Requires: ((emacs "26.1") (dash "2.13") (org "9.4") (magit-section "3.0.0")) +;; Package-Requires: ((emacs "26.1") (dash "2.13") (org "9.6") (magit-section "3.0.0")) ;; This file is NOT part of GNU Emacs. @@ -478,7 +478,7 @@ NODE, unless FORCE is non-nil." (org-roam-id-at-point)))) (goto-char m)) (move-marker m nil)) - (org-show-context)) + (org-fold-show-context)) (defun org-roam-node-visit (node &optional other-window force) "From the current buffer, visit NODE. Return the visited buffer. diff --git a/org-roam-utils.el b/org-roam-utils.el index 11efcc2..94c4933 100644 --- a/org-roam-utils.el +++ b/org-roam-utils.el @@ -6,7 +6,7 @@ ;; URL: https://github.com/org-roam/org-roam ;; Keywords: org-mode, roam, convenience ;; Version: 2.2.2 -;; Package-Requires: ((emacs "26.1") (dash "2.13") (org "9.4")) +;; Package-Requires: ((emacs "26.1") (dash "2.13") (org "9.6")) ;; This file is NOT part of GNU Emacs. diff --git a/org-roam.el b/org-roam.el index a6b7a48..30fc82d 100644 --- a/org-roam.el +++ b/org-roam.el @@ -6,7 +6,7 @@ ;; URL: https://github.com/org-roam/org-roam ;; Keywords: org-mode, roam, convenience ;; Version: 2.2.2 -;; Package-Requires: ((emacs "26.1") (dash "2.13") (org "9.4") (emacsql "4.1.0") (magit-section "3.0.0")) +;; Package-Requires: ((emacs "26.1") (dash "2.13") (org "9.6") (emacsql "4.1.0") (magit-section "3.0.0")) ;; This file is NOT part of GNU Emacs.