branch: externals/hyperbole
commit d3f397251dd048481e65b84c90253bfbc325e79a
Author: Robert Weiner <r...@gnu.org>
Commit: Robert Weiner <r...@gnu.org>
Fix klink:create interactive spec and other byte-compiler warnings
---
ChangeLog | 8 ++++++++
hargs.el | 3 ++-
hibtypes.el | 8 ++++----
hui-mini.el | 39 +++++++++++++++++++--------------------
kotl/klink.el | 15 ++++++++-------
kotl/kotl-orgtbl.el | 14 +++++++-------
6 files changed, 48 insertions(+), 39 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 0921427c82..4f0ae8880b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,13 @@
2023-08-08 Bob Weiner <r...@gnu.org>
+* hui-mini.el (hui:menus): Remove delq from top-level menu where never
+ dynamically delete entries.
+
+* hibtypes.el (parse-label-and-file): Rename to 'hlink:parse-label-and-file' to
+ prevent prefix byte-compiler warning.
+
+* kotl/klink.el (klink:create): Fix interactive spec.
+
* test/hmouse-drv-tests.el (hbut-ib-create-label): Fix by allowing recursive
minibuffers.
* kotl/kotl-mode.el (kotl-mode:self-insert-command): Remove special kotl-mode
auto-filling
diff --git a/hargs.el b/hargs.el
index 4e5ae1d8f7..14af2baa9b 100644
--- a/hargs.el
+++ b/hargs.el
@@ -3,7 +3,7 @@
;; Author: Bob Weiner
;;
;; Orig-Date: 31-Oct-91 at 23:17:35
-;; Last-Mod: 6-Aug-23 at 22:14:05 by Bob Weiner
+;; Last-Mod: 9-Aug-23 at 00:16:24 by Bob Weiner
;;
;; SPDX-License-Identifier: GPL-3.0-or-later
;;
@@ -61,6 +61,7 @@
(declare-function vertico-exit "ext:vertico")
(declare-function vertico-insert "ext:vertico")
(declare-function vertico-mouse--index "ext:vertico")
+(declare-function vertico--match-p "ext:vertico")
;;; ************************************************************************
;;; Private functions
diff --git a/hibtypes.el b/hibtypes.el
index 629a02b23f..43f074accd 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: 8-Jul-23 at 14:02:33 by Bob Weiner
+;; Last-Mod: 9-Aug-23 at 00:04:58 by Bob Weiner
;;
;; SPDX-License-Identifier: GPL-3.0-or-later
;;
@@ -790,7 +790,7 @@ END-DELIM."
(end-pos (nth 2 label-start-end))
but-key lbl-key key-file partial-lbl)
(when label-and-file
- (setq label-and-file (parse-label-and-file label-and-file)
+ (setq label-and-file (hlink:parse-label-and-file label-and-file)
partial-lbl (nth 0 label-and-file)
but-key (hbut:label-to-key partial-lbl)
key-file (nth 1 label-and-file)
@@ -798,7 +798,7 @@ END-DELIM."
(ibut:label-set (hbut:key-to-label lbl-key) start-pos end-pos)
(hact link-actype but-key key-file))))
-(defun parse-label-and-file (label-and-file)
+(defun hlink:parse-label-and-file (label-and-file)
"Parse colon-separated string LABEL-AND-FILE into a list of label and file
path."
;; Can't use split-string here because file path may contain colons;
;; we want to split only on the first colon.
@@ -809,7 +809,7 @@ END-DELIM."
(while (< i len)
(when (= ?: (aref label-and-file i))
(when (zerop i)
- (error "(parse-label-and-file): Missing label: '%s'" label-and-file))
+ (error "(hlink:parse-label-and-file): Missing label: '%s'"
label-and-file))
(setq label (hpath:trim (substring label-and-file 0 i))
file (hpath:trim (substring label-and-file (1+ i))))
(when (string-empty-p label) (setq label nil))
diff --git a/hui-mini.el b/hui-mini.el
index 5a26485b95..7a351ba6b2 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-Aug-23 at 14:13:50 by Bob Weiner
+;; Last-Mod: 9-Aug-23 at 00:21:49 by Bob Weiner
;;
;; SPDX-License-Identifier: GPL-3.0-or-later
;;
@@ -653,25 +653,24 @@ The menu is a menu of commands from MENU-ALIST."
(substring hyperb:version 1)
hyperb:version)))
(list (list (concat "Hy" version ">"))))
- (delq nil
- '(
- ("Act" hui:hbut-act "Activate button at point or
prompt for a labeled button in buffer.")
- ("Butfile/" (menu . butfile) "Quick access button files
menus.")
- ("Cust/" (menu . cust) "Customize Hyperbole by
setting major options.")
- ("Doc/" (menu . doc) "Quick access to Hyperbole
documentation.")
- ("Ebut/" (menu . ebut) "Explicit button commands.")
- ("Find/" (menu . find) "Find matching line
commands.")
- ("Gbut/" (menu . gbut) "Global button commands.")
- ("Hist" hhist:pop
- "Jumps back to location prior to last Hyperbole button
follow.")
- ("Ibut/" (menu . ibut) "Implicit button and button
type commands.")
- ("Kotl/" (menu . kotl) "Autonumbered outlining and
hyperlink capabilities.")
- ("Msg/" (menu . msg) "Mail and News messaging
capabilities.")
- ("Rolo/" (menu . hyrolo) "Hierarchical, multi-file
rolo lookup and edit commands.")
- ("Screen/" (menu . screen) "Screen display management
commands.")
- ;; ("To/" (menu . to) "A-Z menu to search and
add Emacs artifacts")
- ("Win/" (menu . win) "Window configuration
management commands.")
- ))))
+ '(
+ ("Act" hui:hbut-act "Activate button at point or prompt
for a labeled button in buffer.")
+ ("Butfile/" (menu . butfile) "Quick access button files menus.")
+ ("Cust/" (menu . cust) "Customize Hyperbole by setting
major options.")
+ ("Doc/" (menu . doc) "Quick access to Hyperbole
documentation.")
+ ("Ebut/" (menu . ebut) "Explicit button commands.")
+ ("Find/" (menu . find) "Find matching line commands.")
+ ("Gbut/" (menu . gbut) "Global button commands.")
+ ("Hist" hhist:pop
+ "Jumps back to location prior to last Hyperbole button follow.")
+ ("Ibut/" (menu . ibut) "Implicit button and button type
commands.")
+ ("Kotl/" (menu . kotl) "Autonumbered outlining and
hyperlink capabilities.")
+ ("Msg/" (menu . msg) "Mail and News messaging
capabilities.")
+ ("Rolo/" (menu . hyrolo) "Hierarchical, multi-file rolo
lookup and edit commands.")
+ ("Screen/" (menu . screen) "Screen display management
commands.")
+ ;; ("To/" (menu . to) "A-Z menu to search and add
Emacs artifacts")
+ ("Win/" (menu . win) "Window configuration management
commands.")
+ )))
'(butfile .
(("Butfile>")
("DirFile" (find-file hbmap:filename)
diff --git a/kotl/klink.el b/kotl/klink.el
index 6f9826c69f..77a3fa9397 100644
--- a/kotl/klink.el
+++ b/kotl/klink.el
@@ -3,7 +3,7 @@
;; Author: Bob Weiner
;;
;; Orig-Date: 15-Nov-93 at 12:15:16
-;; Last-Mod: 7-Aug-23 at 22:29:59 by Bob Weiner
+;; Last-Mod: 8-Aug-23 at 23:57:36 by Bob Weiner
;;
;; SPDX-License-Identifier: GPL-3.0-or-later
;;
@@ -107,12 +107,13 @@ return an absolute klink string. Klink returned is of
the form:
REFERENCE should be a cell-ref or a string containing \"filename, cell-ref\".
See documentation for `kcell:ref-to-id' for valid cell-ref formats."
(interactive
- (barf-if-buffer-read-only)
- ;; This `default-directory' setting is referenced in "hargs.el" for
argument getting.
- (hattr:set 'hbut:current 'dir default-directory)
- (save-excursion
- (hargs:iform-read
- '(interactive "*+LInsert link to <[file,] cell-id [|vspecs]>: "))))
+ (progn
+ (barf-if-buffer-read-only)
+ ;; This `default-directory' setting is referenced in "hargs.el" for
argument getting.
+ (hattr:set 'hbut:current 'dir default-directory)
+ (save-excursion
+ (hargs:iform-read
+ '(interactive "*+LInsert link to <[file,] cell-id [|vspecs]>: ")))))
(barf-if-buffer-read-only)
;; Reference generally is a string. It may be a list as a string, e.g.
;; "(\"file\" \"cell\")", in which case, we remove the unneeded internal
diff --git a/kotl/kotl-orgtbl.el b/kotl/kotl-orgtbl.el
index dde735c215..347abe2247 100644
--- a/kotl/kotl-orgtbl.el
+++ b/kotl/kotl-orgtbl.el
@@ -3,7 +3,7 @@
;; Author: Bob Weiner
;;
;; Orig-Date: 10/18/2020
-;; Last-Mod: 8-Aug-23 at 23:09:41 by Bob Weiner
+;; Last-Mod: 9-Aug-23 at 00:07:51 by Bob Weiner
;;
;; SPDX-License-Identifier: GPL-3.0-or-later
;;
@@ -142,12 +142,12 @@ If no previous line, exchange current with next line."
(org-remap kotl-mode-overriding-orgtbl-mode-map cmd local-cmd)))
(setq cmds
(if orgtbl-optimized
- (nconc '(delete-backward-char
- delete-char
- delete-forward-char
- ;; self-insert-command
- )
- cmds)
+ (append '(delete-backward-char
+ delete-char
+ delete-forward-char
+ ;; self-insert-command
+ )
+ cmds)
cmds)))))
(error
(setq kotl-mode-overriding-orgtbl-mode-map nil)
