Merge pull request #407 from rswgnu/rsw

Improve tag/symbol finding, <> and {} handling

Author: rswgnu

ChangeLog

@@ -1,9 +1,36 @@
+2023-12-01  Bob Weiner  <[email protected]>
+
+* hargs.el (hargs:delimited): Remove use of 'bounds-of-thing-at-point'
+    and (require 'thingatpt) since it doesn't use the delimiters given
+    and returns wrong results.  This fixes defal tests that were failing.
+
+* hyrolo.el (hyrolo-grep): Fix to ensure 'outline-regexp' setting for all
+    matching file types is set locally in the match buffer only.
+            (hyrolo-mode): Use 'setq-local' instead of 'make-local-variable'.
+	    (require 'outline): Add and remove its function declarations.
+
+* hpath.el (hpath:expand): Fix to allow return of paths with file wildcards
+    that are not yet expanded.  Use 'hpath:expand-list' to expand them.
+           (hpath:expand-list): Fix to call 'hpath:expand' before resolving
+    wildcards, so that variables are resolved first.  Also make 'match-regexp'
+    argument optional, in which case all files are matched.  Improve doc string.
+
+2023-11-30  Bob Weiner  <[email protected]>
+
+* hyrolo.el (hyrolo-grep-file): Add 'backward-search-limit' to minimize
+    backward searches to the end of the last match and to prevent
+    forward search stalls in some contexts.
+
+* hypb.el (hypb:insert-hyperbole-banner): Keep any initial line of
+    variable settings (starts with -*-, e.g. for Org mode as the first
+    line.
+
 2023-11-30  Mats Lidell  <[email protected]>
 
 * test/hui-tests.el (hui--ebut-link-directly-to-file)
     (hui--ebut-link-directly-to-dired, hui--buf-writable-err)
     (hui--gbut-link-directly-ibut, hui--gbut-link-directly-ebut): Add
-    tests for ebut-link-directly. 
+    tests for ebut-link-directly.
 
 2023-11-29  Mats Lidell  <[email protected]>
 
@@ -26,11 +53,52 @@
 
 * Remove warnings for unknown functions by using declare-function.
 
+2023-11-23  Bob Weiner  <[email protected]>
+
+* hui-select.el (hui-select-syntax-table): Change to copy syntax
+    table so changes do not affect the parent.
+
+* hbut.el (hbut:modify-syntax): Add <> and {} pair support in text
+    and fundamental modes.
+          (require 'mode-local): Use in 'hbut:modify-syntax'.
+  hib-kbd.el (defib kbd-key): Remove explicit syntax setting of braces
+    and just temporarily use Hyperbole-modified text-mode syntax table.
+  hyrolo.el (hyrolo-mode-syntax-table): Remove explicit syntax setting
+    of < > delimiters; inherit from 'text-mode-syntax-table' instead.
+
+* test/hui-select-tests.el (hui-select--thing): Fix to skip 'indent-def
+    by removing final newline.  Label each test section with the type
+    of match expected.
+    (hui-select--thing-interactive-prints-type-of-match): Make similar
+    fixes as in above function.
+
 2023-11-22  Mats Lidell  <[email protected]>
 
 * test/demo-tests.el (fast-demo-key-series-dired-other-window): Add test
     from demo key series.
 
+2023-11-22  Bob Weiner  <[email protected]>
+
+* hui-mouse.el (hkey-alist): Add clause to handle Smart Key when in
+    a vertico minibuffer window; make it behave like standard vertico
+    which exits and selects the first minibuffer line, not the candidate
+    presently selected.
+
+* hargs.el (hargs:delimited):
+           (require 'thingatpt): For 'bounds-of-thing-at-point'
+    used in 'hargs:delimited' on single char matching delims.
+
+* hui-select.el (hui-select-scan-sexps): Add to fix brace handling
+    as a matching pair when selecting things by using previously
+    unused 'hui-select-syntax-table'.
+
+* hmouse-tag.el (smart-lisp-bound-symbol-def): Rewrite to support
+    Hyperbole type defs like defib, etc.  This improves finding
+    the proper definition of a Hyperbole type.
+                (find-defact-regexp, find-defal-regexp,
+                 find-defib-regexp, find-defil-regexp): Add these
+    entries to 'find-function-regexp-alist'.
+
 2023-11-21  Bob Weiner  <[email protected]>
 
 * hui-select.el (hui-select-initialize): Fix to set 'syntax-table-sym'

DEMO

@@ -1,3 +1,5 @@
+-*- Mode: org; org-cycle-global-at-bob: t; hsys-org-enable-smart-keys: t -*-
+
 * GNU Hyperbole Full Demo/Tutorial by Bob Weiner
 
   Send an email or a testimonial if you like Hyperbole to <[email protected]>.

FAST-DEMO

@@ -1,4 +1,4 @@
-;;; -*- Mode: org; org-cycle-global-at-bob: t; hsys-org-enable-smart-keys: t -*-
+-*- Mode: org; org-cycle-global-at-bob: t; hsys-org-enable-smart-keys: t -*-
 
 * GNU Hyperbole Fast Demo by Bob Weiner
 
@@ -191,11 +191,11 @@
        Press {C-h A} when over any Hyperbole button for an explanation of
        what it does.
 
-    {M-x dired-other-window RET ${hyperb:dir}/*.el RET}
+    {M-x dired-other-window RET ${hyperb:dir}/*.el M-RET}
 
        Hyperbole home directory Dired listing of Emacs Lisp files only
 
-    {C-c @ 22 RET}
+    {C-22 C-c @}
 
        Display a 2x2 windows grid in the current frame of the 4 most recently
        used buffers.  Before you try this, remember the binding {C-h h h} for
@@ -207,15 +207,16 @@
        Find the Hyperbole Koutliner source files that begin with 'kotl' and
        display them in an auto-sized grid of windows.
 
-    {C-u 0 C-c @ emacs-lisp-mode RET 33 RET}
+    {C-0 C-c @ emacs-lisp-mode RET 33 RET}
 
        Display the 9 mostly recently used Emacs Lisp buffers in a 3x3 grid.
        A BLANK buffer fills in the grid if there are not enough Emacs Lisp
        ones.
 
     {C-x 4 d ${hyperb:dir} RET}
 
-       Dired the Hyperbole home directory based on its variable.
+       Dired the Hyperbole home directory based on its variable.  {M-RET} on
+       the directory itself will display the directory's value in the minibuffer.
 
        Within this dired buffer, mark a few files with {m} and then press {@}
        to display a window grid of those files only.  That works in Buffer

HY-NEWS

@@ -1,3 +1,5 @@
+-*- Mode: org; org-cycle-global-at-bob: t; hsys-org-enable-smart-keys: t -*-
+
 *			  What's New in GNU Hyperbole
 				 by Bob Weiner
 

README

@@ -3,9 +3,9 @@
 # Author:       Bob Weiner
 #
 # Orig-Date:    19-Oct-91 at 03:27:47
-# Last-Mod:     24-Jan-22 at 00:19:12 by Bob Weiner
+# Last-Mod:     24-Jan-23 at 00:19:12 by Bob Weiner
 #
-# Copyright (C) 1989-2021  Free Software Foundation, Inc.
+# Copyright (C) 1989-2023  Free Software Foundation, Inc.
 # See the "HY-COPY" file for license information.
 #
 # This file is part of GNU Hyperbole.

hargs.el

@@ -3,7 +3,7 @@
 ;; Author:       Bob Weiner
 ;;
 ;; Orig-Date:    31-Oct-91 at 23:17:35
-;; Last-Mod:     25-Nov-23 at 16:38:50 by Mats Lidell
+;; Last-Mod:      1-Dec-23 at 11:23:52 by Bob Weiner
 ;;
 ;; SPDX-License-Identifier: GPL-3.0-or-later
 ;;
@@ -128,7 +128,9 @@ START-DELIM is treated as a regular expression.  END-REGEXP-FLAG
 is similar.  With optional LIST-POSITIONS-FLAG, return list
 of (string-matched start-pos end-pos).  Optional
 EXCLUDE-REGEXP is compared against the match string with its delimiters
-included; any string that matches this regexp is ignored."
+included; any string that matches this regexp is ignored.  Optional
+AS-KEY non-nil means return the string normalized as a Hyperbole
+button key (no spaces)."
   (let* ((opoint (point))
 	 ;; This initial limit is the forward search limit for start delimiters
 	 (limit (if start-regexp-flag
@@ -140,12 +142,13 @@ included; any string that matches this regexp is ignored."
 	 (end-search-func   (if end-regexp-flag   're-search-forward 'search-forward))
 	 (count 0)
 	 first
-	 start
-	 end
+	 start ;; excludes delimiter
+	 end   ;; excludes delimiter
 	 start-pos
 	 end-pos
 	 start-with-delim
 	 end-with-delim)
+
     (if (string-equal start-delim end-delim)
 	(save-excursion
 	  (beginning-of-line)
@@ -205,14 +208,16 @@ included; any string that matches this regexp is ignored."
 	(goto-char opoint)
 	(and (funcall end-search-func end-delim limit t)
 	     (setq end (match-beginning 0)
-		   end-with-delim (match-end 0))
+		   end-with-delim (match-end 0)))))
 
-	     ;; Ignore any preceding backslash, e.g. when a double-quoted
-	     ;; string is embedded within a doc string, except when
-	     ;; the string starts with 2 backslashes or an MSWindows
-	     ;; disk drive prefix, in which case the backslash is
-	     ;; considered part of a pathname.
-	     (if (and (> end (point-min))
+    (when (and start end)
+      (save-excursion
+	;; Ignore any preceding backslash, e.g. when a double-quoted
+	;; string is embedded within a doc string, except when
+	;; the string starts with 2 backslashes or an MSWindows
+	;; disk drive prefix, in which case the backslash is
+	;; considered part of a pathname.
+	(and (if (and (> end (point-min))
 		      (= (char-before end) ?\\)
 		      (not (string-match (concat "\\(\\`[\\][\\]\\)\\|"
 						 hpath:mswindows-mount-prefix)

hbut.el

@@ -3,11 +3,11 @@
 ;; Author:       Bob Weiner
 ;;
 ;; Orig-Date:    18-Sep-91 at 02:57:09
-;; Last-Mod:     25-Nov-23 at 17:10:28 by Mats Lidell
+;; Last-Mod:     30-Nov-23 at 23:23:53 by Bob Weiner
 ;;
 ;; SPDX-License-Identifier: GPL-3.0-or-later
 ;;
-;; Copyright (C) 1991-2022  Free Software Foundation, Inc.
+;; Copyright (C) 1991-2023  Free Software Foundation, Inc.
 ;; See the "HY-COPY" file for license information.
 ;;
 ;; This file is part of GNU Hyperbole.
@@ -1503,24 +1503,32 @@ non-nil)."
     (nreverse result)))
 
 (defvar   hbut:syntax-table (copy-syntax-table emacs-lisp-mode-syntax-table)
-  "Modified Elisp syntax table for use with Action and Key Series buttons.
-Makes < > and { } into syntactically matching pairs after `hyperb:init'
+  "Syntax table copied from Elisp for use with Action and Key Series buttons.
+Make < > and { } into syntactically matching pairs after `hyperb:init'
 calls `hbut:modify-syntax'.")
 
 ;;;###autoload
 (defun    hbut:modify-syntax ()
-  "Modify syntactic character pairs in syntax tables.
-Modify `hbut:syntax-table' and `help-mode-syntax-table'.  For use
-with implicit button activations."
-  ;; Treat angle brackets as opening and closing delimiters for ease
-  ;; of matching.
+  "Make <> and {} behave as syntactic character pairs in major syntax tables.
+Modify `hbut:syntax-table' and `help-mode-syntax-table' to include <> and {}.
+Modify `text-mode-syntax-table' and `fundamental-mode's syntax table
+to include {} only.  For use with implicit button activations."
+  ;; Treat angle brackets and braces as opening and closing delimiters
+  ;; for ease  of matching.
   (mapc (lambda (syntax-table)
 	  (modify-syntax-entry ?\< "(>" syntax-table)
 	  (modify-syntax-entry ?\> ")<" syntax-table)
 	  ;; Treat braces as opening and closing delimiters for ease of matching.
 	  (modify-syntax-entry ?\{ "(}" syntax-table)
 	  (modify-syntax-entry ?\} "){" syntax-table))
 	(list hbut:syntax-table help-mode-syntax-table))
+  (mapc (lambda (syntax-table)
+	  ;; Treat braces as opening and closing delimiters for ease of matching.
+	  (modify-syntax-entry ?\{ "(}" syntax-table)
+	  (modify-syntax-entry ?\} "){" syntax-table))
+	(list text-mode-syntax-table
+	      ;; fundamental-mode syntax table
+	      (standard-syntax-table)))
   nil)
 
 (defun    hbut:outside-comment-p ()

hib-kbd.el

@@ -3,7 +3,7 @@
 ;; Author:       Bob Weiner
 ;;
 ;; Orig-Date:    22-Nov-91 at 01:37:57
-;; Last-Mod:     19-Nov-23 at 17:55:29 by Bob Weiner
+;; Last-Mod:     23-Nov-23 at 01:51:41 by Bob Weiner
 ;;
 ;; SPDX-License-Identifier: GPL-3.0-or-later
 ;;
@@ -117,50 +117,44 @@ Any key sequence within the series must be a string of one of the following:
 	      (and (looking-at "[{}]") (/= ?\\ (preceding-char))))
     ;; Temporarily make open and close braces have list syntax for
     ;; matching purposes.
-    (let ((open-brace-syntax (hypb:get-raw-syntax-descriptor ?\{))
-	  (close-brace-syntax (hypb:get-raw-syntax-descriptor ?\})))
-      (unwind-protect
-	  (progn (modify-syntax-entry ?\{ "(}" (syntax-table))
-		 (modify-syntax-entry ?\} "){" (syntax-table))
-		 ;; Handle long series, e.g. eval-elisp actions
-		 (let* ((hbut:max-len (max 3000 (hbut:max-len)))
-			(seq-and-pos (or
-				      ;; (kbd) calls but only if point is between double quotes
- 				      (and (hbut:label-p t "(kbd \"" "\"\)" t)
-					   (hbut:label-p t "\"" "\"\)" t))
-				      ;; braces delimiters
-				      (hbut:label-p t "{`" "'}" t)
-				      (hbut:label-p t "{" "}" t)
-				      ;; Regular dual single quotes (Texinfo smart quotes)
-				      (hbut:label-p t "``" "''" t)
-				      ;; Typical GNU manual key sequences; note
-				      ;; these are special quote marks, not the
-				      ;; standard ASCII characters.
-				      (hbut:label-p t "‘" "’" t)))
-			;; This excludes delimiters
-			(key-series (car seq-and-pos))
-			(start (cadr seq-and-pos))
-			binding)
-		   ;; Match only when start delimiter is preceded by whitespace,
-		   ;; double quotes or is the 1st buffer character, so do not
-		   ;; match to things like ${variable}.
-		   (when (memq (char-before start) '(nil ?\ ?\t ?\n ?\r ?\f ?\"))
-		     (when (and (stringp 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 "\\${\\([^}]+\\)}"))
-			 (setq key-series (hpath:substitute-value key-series)))
-
-		       (setq key-series (kbd-key:normalize key-series)
-			     binding (kbd-key:binding key-series)))
-		     (and (stringp key-series)
-			  (or (and binding (not (integerp binding)))
-			      (kbd-key:special-sequence-p key-series))
-			  (ibut:label-set seq-and-pos)
-			  (hact 'kbd-key key-series)))))
-	(hypb:set-raw-syntax-descriptor ?\{ open-brace-syntax)
-	(hypb:set-raw-syntax-descriptor ?\} close-brace-syntax)))))
+    (with-syntax-table text-mode-syntax-table
+      ;; Handle long series, e.g. eval-elisp actions
+      (let* ((hbut:max-len (max 3000 (hbut:max-len)))
+	     (seq-and-pos (or
+			   ;; (kbd) calls but only if point is between double quotes
+ 			   (and (hbut:label-p t "(kbd \"" "\"\)" t)
+				(hbut:label-p t "\"" "\"\)" t))
+			   ;; braces delimiters
+			   (hbut:label-p t "{`" "'}" t)
+			   (hbut:label-p t "{" "}" t)
+			   ;; Regular dual single quotes (Texinfo smart quotes)
+			   (hbut:label-p t "``" "''" t)
+			   ;; Typical GNU manual key sequences; note
+			   ;; these are special quote marks, not the
+			   ;; standard ASCII characters.
+			   (hbut:label-p t "‘" "’" t)))
+	     ;; This excludes delimiters
+	     (key-series (car seq-and-pos))
+	     (start (cadr seq-and-pos))
+	     binding)
+	;; Match only when start delimiter is preceded by whitespace,
+	;; double quotes or is the 1st buffer character, so do not
+	;; match to things like ${variable}.
+	(when (memq (char-before start) '(nil ?\ ?\t ?\n ?\r ?\f ?\"))
+	  (when (and (stringp 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 "\\${\\([^}]+\\)}"))
+	      (setq key-series (hpath:substitute-value key-series)))
+
+	    (setq key-series (kbd-key:normalize key-series)
+		  binding (kbd-key:binding key-series)))
+	  (and (stringp key-series)
+	       (or (and binding (not (integerp binding)))
+		   (kbd-key:special-sequence-p key-series))
+	       (ibut:label-set seq-and-pos)
+	       (hact 'kbd-key key-series)))))))
 
 ;;; ************************************************************************
 ;;; Public functions