branch: externals/hyperbole
commit 270aab31c7c66c40acc11d155ba8c0b269dc9971
Author: Mats Lidell <mats.lid...@lidells.se>
Commit: GitHub <nore...@github.com>
Matsl rsw fix more warnings reported by ci/cd (#438)
---
hsys-org-roam.el | 5 ++---
hyrolo.el | 25 +++++++++++++++----------
2 files changed, 17 insertions(+), 13 deletions(-)
diff --git a/hsys-org-roam.el b/hsys-org-roam.el
index cb2436d221..b0cd08321e 100644
--- a/hsys-org-roam.el
+++ b/hsys-org-roam.el
@@ -3,7 +3,7 @@
;; Author: Bob Weiner
;;
;; Orig-Date: 26-Feb-23 at 11:20:15 by Bob Weiner
-;; Last-Mod: 29-Oct-23 at 16:08:40 by Bob Weiner
+;; Last-Mod: 6-Jan-24 at 00:54:15 by Mats Lidell
;;
;; SPDX-License-Identifier: GPL-3.0-or-later
;;
@@ -37,7 +37,7 @@
;;;###autoload
(defun hsys-org-roam-consult-grep ()
- "Prompt for search terms and run consult grep over `org-roam-directory'
+ "Prompt for search terms and run consult grep over `org-roam-directory'.
Actual grep function used is given by the variable,
`consult-org-roam-grep-func'."
(interactive)
@@ -55,4 +55,3 @@ Actual grep function used is given by the variable,
(provide 'hsys-org-roam)
;;; hsys-org-roam.el ends here
-
diff --git a/hyrolo.el b/hyrolo.el
index 26edea9cd6..b400dc575b 100644
--- a/hyrolo.el
+++ b/hyrolo.el
@@ -3,7 +3,7 @@
;; Author: Bob Weiner
;;
;; Orig-Date: 7-Jun-89 at 22:08:29
-;; Last-Mod: 5-Jan-24 at 01:29:50 by Bob Weiner
+;; Last-Mod: 6-Jan-24 at 10:02:10 by Mats Lidell
;;
;; SPDX-License-Identifier: GPL-3.0-or-later
;;
@@ -1871,7 +1871,7 @@ See the command `outline-mode' for more information on
this mode."
;; Cause use of ellipses for invisible text.
(add-to-invisibility-spec '(outline . t)))
;; disable minor mode
- (when outline-minor-mode-cycle
+ (when (and (boundp 'outline-minor-mode-cycle) outline-minor-mode-cycle)
(remove-overlays nil nil 'outline-overlay t))
(setq line-move-ignore-invisible nil)
;; Disable use of ellipses for invisible text.
@@ -1901,12 +1901,18 @@ Calls the functions given by `hyrolo-mode-hook'.
;; the end of the match. Note this change adds one
;; level to the level count, so `hyrolo-outline-level'
;; decrements it by one. -- rsw, 2023-11-17
- outline-level #'hyrolo-outline-level
- ;; Can't cycle because {TAB} moves to next match
- outline-minor-mode-cycle nil
- ;; For speed reasons, don't want to ever font-lock
- ;; in this mode
- outline-minor-mode-highlight nil))
+ outline-level #'hyrolo-outline-level)
+
+ (when (boundp 'outline-minor-mode-cycle)
+ (setq-local
+ ;; Can't cycle because {TAB} moves to next match
+ outline-minor-mode-cycle nil))
+
+ (when (boundp 'outline-minor-mode-highlight)
+ (setq-local
+ ;; For speed reasons, don't want to ever font-lock
+ ;; in this mode
+ outline-minor-mode-highlight nil)))
(use-local-map hyrolo-mode-map)
(set-syntax-table hyrolo-mode-syntax-table)
@@ -2064,8 +2070,7 @@ A match buffer header is one that starts with
`hyrolo-hdr-regexp'."
(if (< arg 0)
(beginning-of-line)
(end-of-line))
- (let ((found-heading-p)
- (opoint (point)))
+ (let ((found-heading-p))
(while (and (not (bobp)) (< arg 0))
(while (and (not (bobp))
(progn (hyrolo-hdr-to-first-line-p)
