branch: externals/hyperbole
commit d9aa141efae0e18ed75503662ef224ffa76def44
Author: Mats Lidell <mats.lid...@lidells.se>
Commit: GitHub <nore...@github.com>
Remove byte compile warnings (#708)
---
ChangeLog | 9 +++++++++
hbut.el | 9 +--------
hsys-org.el | 9 +++++----
hywiki.el | 4 +++-
4 files changed, 18 insertions(+), 13 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index afb82c4356..bd0698c5e2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2025-04-21 Mats Lidell <ma...@gnu.org>
+
+* hywiki.el (ibtypes::pathname, ibtypes::pathname-line-and-column):
+ Declare functions from hpath.
+
+* hsys-org.el (hsys-org-link-at-p): Reinsert let binding of label-start-end.
+
+* hbut.el (ibut:insert-text): Remove shadowed pcase.
+
2025-04-20 Mats Lidell <ma...@gnu.org>
* test/hywiki-tests.el (hywiki-tests--filename-same-as-wiki-word): Add
diff --git a/hbut.el b/hbut.el
index 4b4b45525d..349ef7f423 100644
--- a/hbut.el
+++ b/hbut.el
@@ -3,7 +3,7 @@
;; Author: Bob Weiner
;;
;; Orig-Date: 18-Sep-91 at 02:57:09
-;; Last-Mod: 20-Apr-25 at 15:16:34 by Bob Weiner
+;; Last-Mod: 20-Apr-25 at 22:19:05 by Mats Lidell
;;
;; SPDX-License-Identifier: GPL-3.0-or-later
;;
@@ -2734,13 +2734,6 @@ Summary of operations based on inputs (name arg from
\\='hbut:current attrs):
(if (eq arg3 0)
(format "\"%s:%d\"" (hpath:shorten arg1) arg2)
(format "\"%s:%d:%d\"" (hpath:shorten arg1) arg2 arg3))))
- ('actypes::link-to-file
- (insert (format "\"%s\""
- (if (/= (length args) 2)
- ;; filename only
- (hpath:shorten arg1)
- ;; includes buffer pos that we translate to line:col
- (hpath:file-position-to-line-and-column arg1 arg2)))))
('actypes::link-to-string-match
(insert (format "\"%s#%s%s\"" (hpath:shorten arg3) arg1
(if (<= arg2 1) "" (concat ":I" (number-to-string
arg2))))))
diff --git a/hsys-org.el b/hsys-org.el
index f4f173f9c3..25af59b80a 100644
--- a/hsys-org.el
+++ b/hsys-org.el
@@ -3,7 +3,7 @@
;; Author: Bob Weiner
;;
;; Orig-Date: 2-Jul-16 at 14:54:14
-;; Last-Mod: 14-Apr-25 at 15:47:21 by Mats Lidell
+;; Last-Mod: 20-Apr-25 at 22:25:14 by Mats Lidell
;;
;; SPDX-License-Identifier: GPL-3.0-or-later
;;
@@ -537,9 +537,10 @@ a non-Org buffer type."
(save-match-data
;; If this Org link matches a potential HyWiki word, ignore it.
(when (not (and (fboundp 'hywiki-word-at) (hywiki-word-at)))
- (if (setq label-start-end (ibut:label-p t "[" "]" t))
- (cons (nth 1 label-start-end) (nth 2 label-start-end))
- t)))))))))
+ (let ((label-start-end (ibut:label-p t "[" "]" t)))
+ (if label-start-end
+ (cons (nth 1 label-start-end) (nth 2 label-start-end))
+ t))))))))))
;; Assume caller has already checked that the current buffer is in org-mode.
(defun hsys-org-heading-at-p (&optional _)
diff --git a/hywiki.el b/hywiki.el
index 1ddafac5be..4e72202125 100644
--- a/hywiki.el
+++ b/hywiki.el
@@ -3,7 +3,7 @@
;; Author: Bob Weiner
;;
;; Orig-Date: 21-Acpr-24 at 22:41:13
-;; Last-Mod: 19-Apr-25 at 22:52:58 by Bob Weiner
+;; Last-Mod: 20-Apr-25 at 22:27:39 by Mats Lidell
;;
;; SPDX-License-Identifier: GPL-3.0-or-later
;;
@@ -175,6 +175,8 @@
(declare-function bookmark-completing-read "bookmark" (prompt &optional
default))
(declare-function bookmark-location "bookmark" (bookmark-name-or-record))
(declare-function hsys-org-at-tags-p "hsys-org")
+(declare-function ibtypes::pathname "hpath")
+(declare-function ibtypes::pathname-line-and-column "hpath")
(declare-function org-link-store-props "ol" (&rest plist))
(declare-function org-publish-property "ox-publish" (property project
&optional default))
(declare-function org-roam-node-from-title-or-alias "org-roam-node" (s
&optional nocase))
