branch: externals/hyperbole
commit e7f9288a8eac0fd6deba75ede27acbe55be5b97d
Author: Mats Lidell <[email protected]>
Commit: GitHub <[email protected]>
Remove more warnings (#300)
---
ChangeLog | 25 ++++++++++++++++++++++++-
hactypes.el | 4 ++--
hib-kbd.el | 6 +++---
hibtypes.el | 4 ++--
hmouse-drv.el | 4 ++--
hmouse-tag.el | 3 +--
hsys-org.el | 10 +++++++---
hui-mini.el | 6 +++---
kotl/kexport.el | 4 ++--
kotl/kview.el | 9 ++-------
10 files changed, 48 insertions(+), 27 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 9c5405c6aa..4b5334fc95 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,28 @@
2023-02-06 Mats Lidell <[email protected]>
+* hui-mini.el (hui:menu-choose): Use hui:menu-exit-hyperbole
+
+* hsys-org.el (hsys-org-search-internal-link-p):
+ (hsys-org-search-radio-target-link-p): Use org-fold-show-context when
+ available.
+
+* hmouse-tag.el (smart-tags-find-p): Remove unused lexical variable
+ find-tag-result
+
+* hmouse-drv.el (hkey-buffer-move): Silence warning by naming unused
+ lexical argument _arg
+
+* hui-mini.el (hui:menu-doc):
+* hibtypes.el (debugger-source):
+* hib-kbd.el (kbd-key): Use string-equal with string literal.
+
+* hactypes.el: Require man for Man-notify-method.
+
+* kotl/kview.el (kview:map-siblings): Remove unused lexical variable
+ cell-indent.
+
+* kotl/kexport.el (kexport:html): Bind lexical var is-collapsible
+
* Cleanup from Stefan Monnier. Thanks Stefan.
* hypb.el (hypb:indirect-function): Use indirect-function directly.
* hgnus.el: Use add-hook directly.
@@ -13,7 +36,7 @@
(set:members): Keep members in stable order; previously returned in
reverse order.
-2023-02-05 Mats Lidell <[email protected]>-02-05 Bob Weiner <[email protected]>
+2023-02-05 Bob Weiner <[email protected]>
* hsys-org.el (hsys-org-mode-function): Improve doc string.
diff --git a/hactypes.el b/hactypes.el
index feeb198257..f7bb5a5b4a 100644
--- a/hactypes.el
+++ b/hactypes.el
@@ -3,7 +3,7 @@
;; Author: Bob Weiner
;;
;; Orig-Date: 23-Sep-91 at 20:34:36
-;; Last-Mod: 7-Jan-23 at 19:59:13 by Bob Weiner
+;; Last-Mod: 28-Jan-23 at 23:27:48 by Mats Lidell
;;
;; SPDX-License-Identifier: GPL-3.0-or-later
;;
@@ -18,7 +18,7 @@
;;; Other required Elisp libraries
;;; ************************************************************************
-(eval-and-compile (mapc #'require '(bookmark hvar hsettings comint hbut hpath
hargs hmail)))
+(eval-and-compile (mapc #'require '(bookmark hvar hsettings comint hbut hpath
hargs hmail man)))
;;; ************************************************************************
;;; Public declarations
diff --git a/hib-kbd.el b/hib-kbd.el
index 62453b9678..8938d3a401 100644
--- a/hib-kbd.el
+++ b/hib-kbd.el
@@ -3,7 +3,7 @@
;; Author: Bob Weiner
;;
;; Orig-Date: 22-Nov-91 at 01:37:57
-;; Last-Mod: 29-Jan-23 at 10:11:10 by Bob Weiner
+;; Last-Mod: 29-Jan-23 at 22:46:13 by Mats Lidell
;;
;; SPDX-License-Identifier: GPL-3.0-or-later
;;
@@ -129,7 +129,7 @@ Any key sequence within the series must be a string of one
of the following:
;; match to things like ${variable}.
(when (memq (char-before start) '(nil ?\ ?\t ?\n ?\r ?\f
?\"))
(when (and (stringp key-series)
- (not (eq key-series "")))
+ (not (string-equal key-series "")))
;; Replace any ${} internal or env vars; leave
;; $VAR untouched for the shell to evaluate.
(let ((hpath:variable-regexp "\\${\\([^}]+\\)}"))
@@ -270,7 +270,7 @@ Any key sequence within the series must be a string of one
of the following:
(kbd-key:remove-delimiters str "‘" "’")))
binding)
(when (and (stringp key-series)
- (not (eq key-series "")))
+ (not (string-equal key-series "")))
(setq key-series (kbd-key:normalize key-series)
binding (kbd-key:binding key-series)))
(and (stringp key-series)
diff --git a/hibtypes.el b/hibtypes.el
index ad0cd03dac..601d98f2e1 100644
--- a/hibtypes.el
+++ b/hibtypes.el
@@ -3,7 +3,7 @@
;; Author: Bob Weiner
;;
;; Orig-Date: 19-Sep-91 at 20:45:31
-;; Last-Mod: 7-Jan-23 at 19:54:51 by Bob Weiner
+;; Last-Mod: 29-Jan-23 at 17:17:39 by Mats Lidell
;;
;; SPDX-License-Identifier: GPL-3.0-or-later
;;
@@ -1023,7 +1023,7 @@ xdb. Such lines are recognized in any buffer."
;; For Meteor app errors, remove the "app/" prefix which
;; is part of the build subdirectory and not part of the
;; source tree.
- (when (and (not (eq col-num "")) (string-match "^app/" file))
+ (when (and (not (string-equal col-num "")) (string-match "^app/" file))
(setq file (substring file (match-end 0))))
(setq but-label (concat file ":" line-num)
diff --git a/hmouse-drv.el b/hmouse-drv.el
index 63643522fd..a368a05d3a 100644
--- a/hmouse-drv.el
+++ b/hmouse-drv.el
@@ -3,7 +3,7 @@
;; Author: Bob Weiner
;;
;; Orig-Date: 04-Feb-90
-;; Last-Mod: 15-Jan-23 at 17:08:53 by Mats Lidell
+;; Last-Mod: 29-Jan-23 at 00:15:24 by Mats Lidell
;;
;; SPDX-License-Identifier: GPL-3.0-or-later
;;
@@ -798,7 +798,7 @@ hkey-swap and hkey-throw."
(interactive)
(hkey-buffer-move 'up))
-(defun hkey-buffer-move (direction &optional arg)
+(defun hkey-buffer-move (direction &optional _arg)
"Move the current buffer to the next window in DIRECTION.
DIRECTION is a symbol, one of: up, down, left or right.
diff --git a/hmouse-tag.el b/hmouse-tag.el
index f161f73b53..d159b5abd4 100644
--- a/hmouse-tag.el
+++ b/hmouse-tag.el
@@ -3,7 +3,7 @@
;; Author: Bob Weiner
;;
;; Orig-Date: 24-Aug-91
-;; Last-Mod: 28-Jan-23 at 23:51:50 by Bob Weiner
+;; Last-Mod: 29-Jan-23 at 16:34:52 by Mats Lidell
;;
;; SPDX-License-Identifier: GPL-3.0-or-later
;;
@@ -1177,7 +1177,6 @@ TAG-SYM may be a function, variable or face."
(tags-file-name (if tags-table-list
nil
(and (boundp 'tags-file-name) tags-file-name)))
- find-tag-result
(tags-add-tables nil))
(condition-case ()
(and func (funcall func tag) t)
diff --git a/hsys-org.el b/hsys-org.el
index c8d28ce6eb..8cfa1fcb05 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: 5-Feb-23 at 17:18:47 by Bob Weiner
+;; Last-Mod: 6-Feb-23 at 09:53:31 by Mats Lidell
;;
;; SPDX-License-Identifier: GPL-3.0-or-later
;;
@@ -342,7 +342,9 @@ White spaces are insignificant. Return t if a link is
found, else nil."
(backward-char)
(let ((object (org-element-context)))
(when (eq (org-element-type object) 'link)
- (org-show-context 'link-search)
+ (if (fboundp 'org-fold-show-context) ;; From Org 9.6
+ (org-fold-show-context 'link-search)
+ (org-show-context 'link-search))
(goto-char (or (previous-single-property-change (point) 'face)
(point-min)))
(throw :link-match t))))
(goto-char origin)
@@ -362,7 +364,9 @@ White spaces are insignificant. Return t if a target link
is found, else nil."
(backward-char)
(let ((object (org-element-context)))
(when (eq (org-element-type object) 'link)
- (org-show-context 'link-search)
+ (if (fboundp 'org-fold-show-context) ;; From Org 9.6
+ (org-fold-show-context 'link-search)
+ (org-show-context 'link-search))
(throw :radio-match t))))
(goto-char origin)
nil)))
diff --git a/hui-mini.el b/hui-mini.el
index 442ca9e792..42223858c4 100644
--- a/hui-mini.el
+++ b/hui-mini.el
@@ -3,7 +3,7 @@
;; Author: Bob Weiner
;;
;; Orig-Date: 15-Oct-91 at 20:13:17
-;; Last-Mod: 6-Nov-22 at 13:09:42 by Bob Weiner
+;; Last-Mod: 29-Jan-23 at 17:17:22 by Mats Lidell
;;
;; SPDX-License-Identifier: GPL-3.0-or-later
;;
@@ -258,7 +258,7 @@ If on the menu name prefix or the first item, move to the
last item."
The documentation is formatted. With optional HELP-STRING-FLAG,
instead returns the one line help string for the key sequence."
(when (and (stringp key-sequence)
- (not (eq key-sequence ""))
+ (not (string-equal key-sequence ""))
(kbd-key:hyperbole-mini-menu-key-p key-sequence))
(let ((hargs:reading-type 'hmenu-help)
(hmenu-key-seq (car (where-is-internal #'hyperbole))))
@@ -409,7 +409,7 @@ documentation, not the full text."
;; 0 for at the end of the menu (does nothing).
(cond ((eq key exit-char)
(set--this-command-keys (concat hui:menu-keys
hui:menu-exit-hyperbole))
- (setq this-command #'hui:menu-exit)
+ (setq this-command #'hui:menu-exit-hyperbole)
nil)
((eq key quit-char)
(set--this-command-keys (concat hui:menu-keys hui:menu-quit))
diff --git a/kotl/kexport.el b/kotl/kexport.el
index 7b5bf446de..b06aa94159 100644
--- a/kotl/kexport.el
+++ b/kotl/kexport.el
@@ -3,7 +3,7 @@
;; Author: Bob Weiner
;;
;; Orig-Date: 26-Feb-98
-;; Last-Mod: 4-Feb-23 at 17:02:23 by Bob Weiner
+;; Last-Mod: 5-Feb-23 at 22:45:12 by Mats Lidell
;;
;; SPDX-License-Identifier: GPL-3.0-or-later
;;
@@ -462,7 +462,7 @@ used. Also converts Urls and Klinks into Html hyperlinks.
">" ">"
(replace-regexp-in-string
"<" "<" (kview:label-separator kview))))
- i is-parent is-last-sibling no-sibling-stack level label
contents)
+ i is-parent is-collapsible is-last-sibling no-sibling-stack
level label contents)
(kview:map-tree
(lambda (_kview)
(setq level (kcell-view:level)
diff --git a/kotl/kview.el b/kotl/kview.el
index e96e01efc1..b510192257 100644
--- a/kotl/kview.el
+++ b/kotl/kview.el
@@ -3,7 +3,7 @@
;; Author: Bob Weiner
;;
;; Orig-Date: 6/30/93
-;; Last-Mod: 16-Oct-22 at 18:32:03 by Mats Lidell
+;; Last-Mod: 5-Feb-23 at 22:36:46 by Mats Lidell
;;
;; SPDX-License-Identifier: GPL-3.0-or-later
;;
@@ -1007,16 +1007,12 @@ in the view.
FUNC should take one argument, the kview local variable of the current
buffer or some other kview, and should operate upon the cell at point.
-The variable `cell-indent' contains the indentation value of the
-first cell mapped when FUNC is called so that it may be tested
-against this value. The variable `lbl-sep-len' contains the label
-separator length.
+The variable `lbl-sep-len' contains the label separator length.
See also `kview:map-branch' and `kview:map-tree'."
(with-current-buffer (kview:buffer kview)
(save-excursion
(let ((lbl-sep-len (kview:label-separator-length kview))
- cell-indent
results)
;; Next line ensures point is in the root of the current tree if
;; the tree is at all hidden.
@@ -1025,7 +1021,6 @@ See also `kview:map-branch' and `kview:map-tree'."
(when first-p
;; Move back to first predecessor at same level.
(while (kcell-view:backward t lbl-sep-len)))
- (setq cell-indent (kcell-view:indent nil lbl-sep-len))
;; Terminate when no further cells at same level.
(while (progn (setq results (cons (funcall func kview) results))
(kcell-view:forward visible-p lbl-sep-len)))
