[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] externals/hyperbole e01b121ceb 1/2: Merge Mats and RSW's recent c
|
From: |
ELPA Syncer |
|
Subject: |
[elpa] externals/hyperbole e01b121ceb 1/2: Merge Mats and RSW's recent changes. Fix bug#61666 from John C. |
|
Date: |
Mon, 27 Feb 2023 05:58:06 -0500 (EST) |
branch: externals/hyperbole
commit e01b121ceb8fbd6d4decdd7b17b71e9483699d34
Author: Bob Weiner <rsw@gnu.org>
Commit: Bob Weiner <rsw@gnu.org>
Merge Mats and RSW's recent changes. Fix bug#61666 from John C.
---
ChangeLog | 96 ++++++++++++++++++++++--------------------------------
HY-ABOUT | 2 +-
HY-NEWS | 53 +++++++++++++++++++++++-------
MANIFEST | 1 +
Makefile | 5 +--
hactypes.el | 5 ++-
hargs.el | 4 ++-
hmouse-drv.el | 11 ++++---
hpath.el | 4 +--
hsys-org-roam.el | 54 ++++++++++++++++++++++++++++++
hui-select.el | 9 ++---
hycontrol.el | 8 ++---
hyrolo.el | 26 ++++++++++++---
man/hyperbole.texi | 14 ++++----
man/version.texi | 4 +--
15 files changed, 194 insertions(+), 102 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index ec1fc1643c..55d748070e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,33 @@
+2023-02-26 Bob Weiner <rsw@gnu.org>
+
+* hpath.el (hpath:prepend-shell-directory): Fix issue that was grabbing
+ first filename after command line since multi-line whitespace was
+ used rather than limiting search to find current directory to the
+ same line as the command.
+
+* hmouse-drv.el (hkey-help): Move button attributes earlier in help doc,
+ {C-h A} output.
+
+* hui-select.el (hui-select-markup-modes): Add Emacs builtin mhtml-mode.
+
+* hactypes.el (display-boolean, display-value, display-variable): Add
+ interactive specs, so can be used as button actypes.
+
+* hargs.el (hargs:iform-vector): Add 'i' interactive spec (ignored arg).
+
+* MANIFEST:
+ Makefile (EL_COMPILE): Add hsys-org-roam.el.
+* hsys-org-roam.el (hsys-org-roam-consult-grep): Add this library and
+ function to interactively grep over org-roam files with live
+ in-buffer display using the automatically installed consult package.
+
+2023-02-22 Bob Weiner <rsw@gnu.org>
+
+* hyrolo.el (consult-org-roam-grep-func): Declare.
+ (hyrolo-consult-grep): Add to interactively grep or ripgrep
+ with live in-buffer display using the automatically installed consult
+ package.
+
2023-02-20 Mats Lidell <matsl@gnu.org>
* test/demo-tests.el (fast-demo-key-series-shell-cd-hyperb-dir-view-mode)
@@ -33,57 +63,7 @@
2023-02-12 Bob Weiner <rsw@gnu.org>
* hibtypes.el (grep-msg): Fix problem where filename match includes trailing
line
- number because of allowing for Lisp variables with colons in their name.
Fix
- by disallowing a digit as the final file name character. Below is a sample
- of the type of grep line that was resolved improperly:
- (display-boolean, display-variable, display-value): Declare
these actypes
- as functions to silence the byte-compiler. These still are not fboundp.
-
- hibtypes.el:1540:1:Warning: the following functions are not known to be
defined:
-
-* hyrolo.el (hyrolo-to-entry-end): Add 2nd _curr-entry-level-len optional
parameter
- for future use.
-
-2023-02-11 Bob Weiner <rsw@gnu.org>
-
-* hmouse-drv.el (hkey-operate): Typically bound to {M-o} which avy transient
minor
- mode also binds, so defer to other minor-modes that bind the same key
rather
- than performing Hyperbole command.
-
-2023-02-06 Mats Lidell <matsl@gnu.org>
-
-* test/set-tests.el: Add tests for Hyperbole set library.
-
-* 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.
-
-2023-02-06 Bob Weiner <rsw@gnu.org>
-
-* set.el (set:member): Optimize for common equality operators.
+ number because of allowing for Lisp variables with colons in their names.
(set:add, set:remove): Convert from a macro to a function and
optimize.
(set:replace): Rename to 'set:replace-key-value' and use 'set:replace'
to replace a non-keyed old-value with a new value.
@@ -1105,10 +1085,11 @@
2022-06-20 Bob Weiner <rsw@gnu.org>
-* hui-mini.el (hui:menu-to-personal-section): Add.
+* hui-mini.el (hui:doc-a-z): Add.
(hui:menu-item): Add support for inserting menu item label
into the action when the action is 'hui:menu-to-personal-section'.
- (hui:menu-a-z): Add this customizable menu.
+ (hui:menu-to): Add this customizable menu but don't activate
+ it until design work is finished.
* hyrolo.el (hyrolo-add): Add newline before adding entry if point is not
at the beginning of the line for insertion, i.e. when buffer does not
@@ -1132,7 +1113,8 @@
(load-hyperbole): Add to allow testing of loading all of Hyperbole.
(eln): Use LOAD_EL and remove autoloads loading prior to native
compiling.
-* test/demo-tests.el (fast-demo-key-series-shell-apropos): Fix to handle shell
startup delay.
+* test/demo-tests.el (fast-demo-key-series-shell-apropos): Fix to handle
+ shell startup delay.
* hypb.el (hypb:function-copy): Since many functions may become primitives
when using the native compiler, return the primitive function in such
@@ -1155,7 +1137,7 @@
compatibility code.
* kotl/kmenu.el (id-menubar-set): Remove declared unused function.
- (id-menubar-kotl): Remove unsued InfoDock menu.
+ (id-menubar-kotl): Remove unused InfoDock menu.
(kotl-menubar-menu): Remove XEmacs compatibility code.
(kotl-mode-hook): Set hook unconditionally.
@@ -1166,7 +1148,7 @@
* hmouse-tag.el (smart-emacs-tags-file): Remove XEmacs, Infodock from doc.
(smart-tags-find-p, smart-tags-display, smart-tags-file-list):
- Remove XEmacs and Infodock compatibility code.
+ Remove XEmacs and InfoDock compatibility code.
* hmouse-mod.el (hmouse-mod-last-char): Remove XEmacs compatibility code.
@@ -1293,7 +1275,7 @@
* test/kexport-tests.el:
test/hmouse-info-tests.el:
test/hmouse-drv-tests.el:
- test/hbut-tests.el: Don't byte compile of test files that depend on
+ test/hbut-tests.el: Don't byte compile any test files that depend on
external test support packages.
2022-05-16 Bob Weiner <rsw@gnu.org>
diff --git a/HY-ABOUT b/HY-ABOUT
index 62263ab27b..5811c10f31 100644
--- a/HY-ABOUT
+++ b/HY-ABOUT
@@ -3,7 +3,7 @@
Designed and Written by Bob Weiner
Maintained by Mats Lidell and Bob Weiner
https://www.gnu.org/software/hyperbole/
- Version 9.0.0
+ Version 8.0.1pre
Say thanks or send a testimonial if you like Hyperbole:
Email: <rsw@gnu.org>
diff --git a/HY-NEWS b/HY-NEWS
index f728a141ae..8720cb07fa 100644
--- a/HY-NEWS
+++ b/HY-NEWS
@@ -7,10 +7,13 @@
** HYPERBOLE SYSTEM
-*** Native Comp Autoloads: Work around Emacs bug where async native comp of
- a package being installed does not load hyperbole-autoloads.el (require
- libraries to eliminate all Error-level messages).
+ *** Native Compilation Autoloads: Work around Emacs bug where async native
+ comp of a package being installed does not load hyperbole-autoloads.el
+ (require libraries to eliminate all Error-level messages).
+ *** Large number of byte-compiler warnings eliminated when building the
+ Hyperbole package. None of these warnings should affect use of
+ Hyperbole.
** HYROLO (See "(hyperbole)HyRolo").
@@ -23,9 +26,17 @@
** KOUTLINER (See "(hyperbole)Koutliner").
-*** M-S-left and M-S-Right: Org compatibility - Add tree promote and demote
- commands to these keys (same as existing M-left and M-right keys).
+ *** M-S-left and M-S-Right: Org compatibility - Add tree promote and demote
+ commands to these keys (same as existing M-left and M-right keys).
+
+** MENUS
+
+ *** Minibuffer Menu Changes:
+ - Multi-line Menus: When a menu line is too long for the screen,
+ it is automatically split into multiple lines and aligned by column
+ for ease of access.
+ *** Move Prefix Arg Number of Items:
** ORG MODE
@@ -40,14 +51,32 @@
** SMART (ACTION AND ASSIST) KEYS (See "(hyperbole)Smart Keys").
-*** Smart Dired: Action Key subdirectory selection at point now works on
- any dired header line, not just the first one. Use {i} to insert
- multiple subdirectories in Dired mode.
+ *** Smart Dired: Action Key subdirectory selection at point now works on
+ any dired header line, not just the first one. Use {i} to insert
+ multiple subdirectories in Dired mode.
+
+ *** Compilation and Grep Error Lines: Error lines in the Emacs Regression
+ Test buffer, *ert*, are now supported, as well as the 'Compiling
+ <file>', 'Loading <file>' and 'In <function>' lines as well as source
+ line references from Emacs Lisp native compilation within the
+ *Async-native-compile-log* buffer.
+
+ *** Path Implicit Buttons: Much improved relative path handling, including
+ expanding into executable paths when pathname is prefixed by ! or &,
+ handling info paths outside `Info-directory-list', like
+ "man/hyperbole.info".
+
+** TEST CASES
+
+ *** Hyperbole Automated Testing: Increased automated test cases to over
+ 265. Simply run 'make test-all' or 'make test' from the command-line
+ when in the Hyperbole source directory and you should see all tests
+ pass. If any fail, you can press the Action Key to see the source of
+ the failure. Full testing is supported under POSIX systems only. See
+ "Makefile" and "test/MANIFEST".
+
-*** Compilation and Grep Error Lines: Error lines in the Emacs Regression
- Test buffer, *ert*, are now supported, as well as the 'Compiling <file>',
- 'Loading <file>' and 'In <function>' lines from Emacs Lisp native
- compilation.
+*** Greatly expanded
===========================================================================
* V8.0.0
diff --git a/MANIFEST b/MANIFEST
index 0040fc1e4e..6e86b0ef91 100644
--- a/MANIFEST
+++ b/MANIFEST
@@ -96,6 +96,7 @@ topwin.py - Python script to find the topmost
macOS app window at a s
--- EXTERNAL SYSTEM ENCAPSULATIONS ---
hsys-org.el - GNU Hyperbole support functions for Org mode
+hsys-org-roam.el - GNU Hyperbole support functions for Org Roam
hsys-www.el - GNU Hyperbole support for Emacs W3 World-Wide Web (WWW)
browsing
hsys-youtube.el - Action buttons to play timestamped segments of Youtube
videos
diff --git a/Makefile b/Makefile
index be8793374c..91cc4d2a31 100644
--- a/Makefile
+++ b/Makefile
@@ -3,7 +3,7 @@
# Author: Bob Weiner
#
# Orig-Date: 15-Jun-94 at 03:42:38
-# Last-Mod: 17-Feb-23 at 00:32:14 by Mats Lidell
+# Last-Mod: 27-Feb-23 at 00:11:12 by Bob Weiner
#
# Copyright (C) 1994-2023 Free Software Foundation, Inc.
# See the file HY-COPY for license information.
@@ -182,7 +182,8 @@ EL_COMPILE = hact.el hactypes.el hargs.el hbdata.el
hbmap.el hbut.el \
hib-social.el hibtypes.el \
hinit.el hload-path.el hmail.el hmh.el hmoccur.el hmouse-info.el \
hmouse-drv.el hmouse-key.el hmouse-mod.el hmouse-sh.el
hmouse-tag.el \
- hpath.el hrmail.el hsettings.el hsmail.el hsys-org.el hsys-www.el
hsys-youtube.el htz.el \
+ hpath.el hrmail.el hsettings.el hsmail.el hsys-org.el
hsys-org-roam.el \
+ hsys-www.el hsys-youtube.el htz.el \
hycontrol.el hui-jmenu.el hui-menu.el hui-mini.el hui-mouse.el
hui-select.el \
hui-treemacs.el hui-window.el hui.el hvar.el hversion.el hvm.el
hypb.el hyperbole.el \
hyrolo-demo.el hyrolo-logic.el hyrolo-menu.el hyrolo.el
hywconfig.el set.el hypb-ert.el \
diff --git a/hactypes.el b/hactypes.el
index f7bb5a5b4a..c5659fb678 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: 28-Jan-23 at 23:27:48 by Mats Lidell
+;; Last-Mod: 26-Feb-23 at 22:35:30 by Bob Weiner
;;
;; SPDX-License-Identifier: GPL-3.0-or-later
;;
@@ -58,6 +58,7 @@ inserted, delete the completions window."
(defact display-boolean (bool-expr)
"Display a message showing the result value of a BOOL-EXPR.
Return any non-nil value or t."
+ (interactive "xDisplay bool expr value: ")
(let ((result (eval bool-expr t)))
(message "Boolean result (%s) = %S; Expr: %S"
(if result "True" "False") result bool-expr)
@@ -66,6 +67,7 @@ Return any non-nil value or t."
(defact display-value (value)
"Display a message showing VALUE (a symbol) and its value.
Return any non-nil value or t."
+ (interactive "SDisplay symbol's value: ")
(let ((result (eval value)))
(message "%S" result)
(or result t)))
@@ -73,6 +75,7 @@ Return any non-nil value or t."
(defact display-variable (var)
"Display a message showing VAR (a symbol) and its value.
Return any non-nil value or t."
+ (interactive "vDisplay variable's value: ")
(message "%s = %S" var (symbol-value var))
(or (symbol-value var) t))
diff --git a/hargs.el b/hargs.el
index cefbe375ee..ac253b6a16 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: 7-Jan-23 at 14:00:52 by Bob Weiner
+;; Last-Mod: 26-Feb-23 at 10:31:04 by Bob Weiner
;;
;; SPDX-License-Identifier: GPL-3.0-or-later
;;
@@ -721,6 +721,8 @@ help when appropriate."
nil 'existing))))
;; Get possibly nonexistent file name.
(?F . (file . (read-file-name prompt default default nil)))
+ ;; Ignore this argument
+ (?i . nil)
;; Get key sequence.
(?k . (key .
(key-description (read-key-sequence
diff --git a/hmouse-drv.el b/hmouse-drv.el
index 32deae5eb4..fb9c2d491b 100644
--- a/hmouse-drv.el
+++ b/hmouse-drv.el
@@ -3,7 +3,7 @@
;; Author: Bob Weiner
;;
;; Orig-Date: 04-Feb-90
-;; Last-Mod: 13-Feb-23 at 00:23:43 by Bob Weiner
+;; Last-Mod: 26-Feb-23 at 22:19:19 by Bob Weiner
;;
;; SPDX-License-Identifier: GPL-3.0-or-later
;;
@@ -1018,15 +1018,16 @@ documentation is found."
calls)
(when (memq cmd-sym '(hui:hbut-act hui:hbut-help))
- (princ (format "%s BUTTON SPECIFICS:\n\n%s\n"
+ (princ (format "%s BUTTON SPECIFICS:\n"
(htype:def-symbol
(if (eq (hattr:get 'hbut:current 'categ)
'explicit)
(hattr:get 'hbut:current 'actype)
- (hattr:get 'hbut:current 'categ)))
- (actype:doc 'hbut:current t)))
+ (hattr:get 'hbut:current 'categ)))))
(hattr:report
- (nthcdr 2 (hattr:list 'hbut:current))))
+ (nthcdr 2 (hattr:list 'hbut:current)))
+ (princ (format "\n%s\n"
+ (actype:doc 'hbut:current t))))
(terpri)))
"")
(message "No %s Key command for current context."
diff --git a/hpath.el b/hpath.el
index f4ff720da0..b92ff38705 100644
--- a/hpath.el
+++ b/hpath.el
@@ -3,7 +3,7 @@
;; Author: Bob Weiner
;;
;; Orig-Date: 1-Nov-91 at 00:44:23
-;; Last-Mod: 3-Dec-22 at 02:20:47 by Bob Weiner
+;; Last-Mod: 26-Feb-23 at 22:30:14 by Bob Weiner
;;
;; SPDX-License-Identifier: GPL-3.0-or-later
;;
@@ -1241,7 +1241,7 @@ it, else return nil."
;; POSIX
(or (and (re-search-backward "^$\\|\\`\\|^\\(.+\\):$"
prior-prompt-pos t)
(setq dir (match-string-no-properties 1)))
- (and (re-search-backward "\\(^\\|
\\)\\(cd\\|pushd\\|ls\\)\\(\\s-+-[-a-zA-Z0-9]*\\)*\\s-+[\'\"]?\\([^&!;,\'\"\t\n\r\f]+[^&!;,\'\"
\t\n\r\f]\\)[\'\"]?" prior-prompt-pos t)
+ (and (re-search-backward "\\(^\\|
\\)\\(cd\\|pushd\\|ls\\)\\([ \t]+-[-a-zA-Z0-9]*\\)*[
\t]+[\'\"]?\\([^&!;,\'\"\t\n\r\f]+[^&!;,\'\" \t\n\r\f]\\)[\'\"]?"
prior-prompt-pos t)
(setq dir (match-string-no-properties 4)))))
(and dir (not (string-empty-p dir))))
(unless (file-name-absolute-p filename)
diff --git a/hsys-org-roam.el b/hsys-org-roam.el
new file mode 100644
index 0000000000..2b13f8d2a5
--- /dev/null
+++ b/hsys-org-roam.el
@@ -0,0 +1,54 @@
+;;; hsys-org.el --- GNU Hyperbole support functions for Org Roam -*-
lexical-binding: t; -*-
+;;
+;; Author: Bob Weiner
+;;
+;; Orig-Date: 26-Feb-23 at 11:20:15 by Bob Weiner
+;; Last-Mod: 27-Feb-23 at 00:18:03 by Bob Weiner
+;;
+;; SPDX-License-Identifier: GPL-3.0-or-later
+;;
+;; Copyright (C) 2023 Free Software Foundation, Inc.
+;; See the "HY-COPY" file for license information.
+;;
+;; This file is part of GNU Hyperbole.
+
+;;; Commentary:
+;;
+;; The autoloaded function, `hsys-org-roam-consult-grep', uses
+;; consult-grep to do a full-text search over notes included
+;; into the user's Org Roam database.
+;;
+;; Use `org-roam-migrate-wizard' to import any Org note files and
+;; assign them UUIDs required for indexing by Org Roam.
+
+;;; Code:
+
+;;; ************************************************************************
+;;; Public declarations
+;;; ************************************************************************
+
+(defvar consult-org-roam-grep-func)
+(declare-function org-roam-db-autosync-mode "ext:org-roam")
+
+;;; ************************************************************************
+;;; Public functions
+;;; ************************************************************************
+
+;;;###autoload
+(defun hsys-org-roam-consult-grep ()
+ "Search with the consult org-roam grep command.
+Interactively show all matches from `hyrolo-file-list'.
+Prompt for the search pattern."
+ (interactive)
+ (unless (package-installed-p 'consult-org-roam)
+ (package-install 'consult-org-roam))
+ (require 'consult-org-roam)
+ (let ((grep-func (when (and (boundp 'consult-org-roam-grep-func)
+ (fboundp consult-org-roam-grep-func))
+ consult-org-roam-grep-func)))
+ (if grep-func
+ (funcall grep-func org-roam-directory)
+ (error "(hyrolo-consult-org-roam-grep): `%s' is an invalid function"
+ consult-org-roam-grep-func))))
+
+(provide 'hsys-org-roam)
diff --git a/hui-select.el b/hui-select.el
index e08acda73d..be74a716d0 100644
--- a/hui-select.el
+++ b/hui-select.el
@@ -3,7 +3,7 @@
;; Author: Bob Weiner
;;
;; Orig-Date: 19-Oct-96 at 02:25:27
-;; Last-Mod: 3-Oct-22 at 20:21:48 by Mats Lidell
+;; Last-Mod: 27-Feb-23 at 00:22:58 by Bob Weiner
;;
;; SPDX-License-Identifier: GPL-3.0-or-later
;;
@@ -109,8 +109,9 @@
(require 'hvar)
(eval-when-compile
- (require 'sgml-mode) ;; for HTML mode
- (require 'nxml-mode) ;; for XML mode
+ (require 'mhtml-mode) ;; for MHTML mode
+ (require 'sgml-mode) ;; for HTML mode
+ (require 'nxml-mode) ;; for XML mode
(require 'web-mode nil t))
;;; ************************************************************************
@@ -124,7 +125,7 @@
:group 'hyperbole-commands)
(defcustom hui-select-markup-modes
- '(html-mode sgml-mode nxml-mode web-mode)
+ '(html-mode mhtml-mode nxml-mode sgml-mode web-mode)
"*List of markup language modes that use SGML-style <tag> </tag> pairs."
:type '(repeat (function :tag "Mode"))
:group 'hyperbole-commands)
diff --git a/hycontrol.el b/hycontrol.el
index b353898e5b..762f085d22 100644
--- a/hycontrol.el
+++ b/hycontrol.el
@@ -3,7 +3,7 @@
;; Author: Bob Weiner
;;
;; Orig-Date: 1-Jun-16 at 15:35:36
-;; Last-Mod: 27-Nov-22 at 11:21:28 by Bob Weiner
+;; Last-Mod: 21-Feb-23 at 21:27:15 by Bob Weiner
;;
;; SPDX-License-Identifier: GPL-3.0-or-later
;;
@@ -1730,9 +1730,9 @@ columns (rightmost) of the grid."
(nreverse (mapcar #'find-file (reverse files))))))
;;;###autoload
-(defun hycontrol-windows-grid-by-file-pattern (arg pattern &optional full)
+(defun hycontrol-windows-grid-by-file-pattern (arg pattern &optional full-flag)
"Display up to an abs(prefix ARG)-sized window grid of files matching
PATTERN.
-Use absolute file paths if called interactively or optional FULL is non-nil.
+Use absolute file paths if called interactively or optional FULL-FLAG is
non-nil.
PATTERN is a shell glob pattern.
Left digit of ARG is the number of grid rows and the right digit
@@ -1747,7 +1747,7 @@ grid size to the closest valid size."
(when (memq arg '(0 1))
(setq arg nil))
(let* ((find-file-wildcards t)
- (files (file-expand-wildcards pattern full))
+ (files (file-expand-wildcards pattern full-flag))
(num-files (length files))
(grid-size (if arg
(hycontrol-windows-grid-validate arg)
diff --git a/hyrolo.el b/hyrolo.el
index 3fa329c202..75b8621113 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: 14-Feb-23 at 00:01:58 by Mats Lidell
+;; Last-Mod: 27-Feb-23 at 00:11:31 by Bob Weiner
;;
;; SPDX-License-Identifier: GPL-3.0-or-later
;;
@@ -46,13 +46,15 @@
;;; Public declarations
;;; ************************************************************************
(defvar helm-org-rifle-show-level-stars)
+(defvar markdown-regex-header)
(defvar org-roam-directory)
(defvar org-roam-db-autosync-mode)
-(defvar markdown-regex-header)
-(declare-function org-roam-db-autosync-mode "ext:org-roam")
+(declare-function consult-grep "ext:consult")
+(declare-function consult-ripgrep "ext:consult")
+(declare-function helm-org-rifle-files "ext:helm-org-rifle")
(declare-function helm-org-rifle-show-full-contents "ext:helm-org-rifle")
(declare-function helm-org-rifle-org-directory "ext:helm-org-rifle")
-(declare-function helm-org-rifle-files "ext:helm-org-rifle")
+(declare-function org-roam-db-autosync-mode "ext:org-roam")
;;; ************************************************************************
;;; Public variables
@@ -1230,6 +1232,22 @@ otherwise just use the cdr of the item."
;;; Org Package Integrations
;;; ************************************************************************
+;;;###autoload
+(defun hyrolo-consult-grep ()
+ "Search with a consult package grep command.
+Use ripgrep (rg) if found, otherwise, plain grep.
+Interactively show all matches from `hyrolo-file-list'.
+Prompt for the search pattern."
+ (interactive)
+ (unless (package-installed-p 'consult)
+ (package-install 'consult))
+ (require 'consult)
+ (let ((files (seq-filter #'file-readable-p hyrolo-file-list))
+ (grep-func (cond ((executable-find "rg")
+ #'consult-ripgrep)
+ (t #'consult-grep))))
+ (funcall grep-func files)))
+
;;;###autoload
(defun hyrolo-helm-org-rifle (&optional context-only-flag)
"Search with helm and interactively show all matches from `hyrolo-file-list'.
diff --git a/man/hyperbole.texi b/man/hyperbole.texi
index d62f810b5c..05f4864948 100644
--- a/man/hyperbole.texi
+++ b/man/hyperbole.texi
@@ -7,7 +7,7 @@
@c Author: Bob Weiner
@c
@c Orig-Date: 6-Nov-91 at 11:18:03
-@c Last-Mod: 8-Jan-23 at 10:13:37 by Mats Lidell
+@c Last-Mod: 26-Feb-23 at 22:42:29 by Bob Weiner
@c %**start of header (This is for running Texinfo on a region.)
@setfilename hyperbole.info
@@ -53,7 +53,7 @@
This manual is for GNU Hyperbole
(Edition @value{EDITION}, Published @value{UPDATED}).
-Copyright @copyright{} 1989-2022 Free Software Foundation, Inc.
+Copyright @copyright{} 1989-2023 Free Software Foundation, Inc.
@quotation
Permission is granted to copy, distribute and/or modify this document
@@ -143,7 +143,7 @@ Texinfo markup language.
<CENTER><H3><A HREF="mailto:rsw@@gnu.org";>Say thanks or send a testimonial if
you like Hyperbole.</A></H3></CENTER>
-<P>Copyright © 1989-2022 Free Software Foundation, Inc.</P>
+<P>Copyright © 1989-2023 Free Software Foundation, Inc.</P>
<P>GNU Hyperbole is available for use, modification, and distribution under
the terms of the GNU General Public License (GPL) Version 3 or later,
@@ -156,7 +156,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.</P>
<PRE>
Edition 8.0.1pre
-Printed January 7, 2023.
+Printed February 26, 2023.
Published by the Free Software Foundation, Inc.
Author: Bob Weiner
@@ -184,7 +184,7 @@ Printed January 7, 2023.
@sp 2
@noindent
-Copyright @copyright{} 1989-2022 Free Software Foundation, Inc.
+Copyright @copyright{} 1989-2023 Free Software Foundation, Inc.
GNU Hyperbole is available for use, modification, and distribution
under the terms of the GNU General Public License (GPL) Version 3 or
@@ -198,7 +198,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
@example
Edition 8.0.1pre
-January 7, 2023
+February 26, 2023
Published by the Free Software Foundation, Inc.
Author: Bob Weiner
@@ -2898,7 +2898,7 @@ Display a message showing VALUE (a symbol) and its value.
Return any non-@samp{nil} value or @samp{t}.
@findex actypes display-variable
-@item display-variable-value
+@item display-variable
Display a message showing the given variable name and its value.
@findex actypes eval-elisp
diff --git a/man/version.texi b/man/version.texi
index 54891f697e..46ad093e3d 100644
--- a/man/version.texi
+++ b/man/version.texi
@@ -1,4 +1,4 @@
-@set UPDATED January, 2022
-@set UPDATED-MONTH January 2022
+@set UPDATED February, 2023
+@set UPDATED-MONTH February 2023
@set EDITION 8.0.1pre
@set VERSION 8.0.1pre