Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions ChangeLog
Original file line number Diff line number Diff line change
@@ -1,3 +1,13 @@
2026-09-12 Mats Lidell <matsl@gnu.org>

* hmouse-drv.el (hkey-help-hbut): Make def lexical var.
(hkey-help-hbut): Break long docstring. Remove unused lexical var.
(hkey-help): Remove unused lexical vars.

* hyrolo.el (hyrolo-hdr-at-p): Define before first use.

* hbut.el (hpath:expand): Declare function.

2026-09-11 Mats Lidell <matsl@gnu.org>

* test/hywiki-tests.el (hywiki-tests--hywiki-face-regions): Add beg
Expand Down
3 changes: 2 additions & 1 deletion hbut.el
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
;; Author: Bob Weiner
;;
;; Orig-Date: 18-Sep-91 at 02:57:09
;; Last-Mod: 10-Sep-26 at 08:50:44 by Bob Weiner
;; Last-Mod: 12-Sep-26 at 13:33:57 by Mats Lidell
;;
;; SPDX-License-Identifier: GPL-3.0-or-later
;;
Expand Down Expand Up @@ -50,6 +50,7 @@ Use the function, (hbut:max-len), to read the proper value.")
(declare-function hargs:delimited "hargs")
(declare-function hargs:read-match "hargs")
(declare-function hpath:display-buffer "hpath")
(declare-function hpath:expand "hpath")
(declare-function hpath:file-position-to-line-and-column "hpath")
(declare-function hpath:find "hpath")
(declare-function hpath:find-noselect "hpath")
Expand Down
21 changes: 8 additions & 13 deletions hmouse-drv.el
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
;; Author: Bob Weiner
;;
;; Orig-Date: 04-Feb-90
;; Last-Mod: 10-Sep-26 at 15:23:19 by Bob Weiner
;; Last-Mod: 12-Sep-26 at 16:43:46 by Mats Lidell
;;
;; SPDX-License-Identifier: GPL-3.0-or-later
;;
Expand Down Expand Up @@ -1158,11 +1158,6 @@ documentation is found."
(let* ((actype (or (actype:elisp-symbol
(hattr:get 'hbut:current 'actype))
(hattr:get 'hbut:current 'actype)))
(actype-doc-flag (and (symbolp actype)
(fboundp actype)
(documentation actype)))
(assist-function-flag (and assisting
actype-doc-flag))
(condition (car hkey-form))
(temp-buffer-show-hook
(lambda (buf)
Expand Down Expand Up @@ -1336,14 +1331,14 @@ documentation is found."
doc))

(defun hkey-help-hbut (&optional assisting)
"Display hbut help for Action or Assist Keys (if ASSISTING prefix arg is non-nil)."
"Display hbut help for Action or Assist Keys.
If ASSISTING prefix arg is non-nil, show help for assist key."
(interactive)
(let* ((actype (or (actype:elisp-symbol
(hattr:get 'hbut:current 'actype))
(hattr:get 'hbut:current 'actype)))
(mouse-flag (when (mouse-event-p last-command-event)
(or action-key-depress-position assist-key-depress-position)))
(mouse-drag-flag (hmouse-drag-p))
(temp-buffer-show-hook
(lambda (buf)
(set-buffer buf)
Expand Down Expand Up @@ -1406,11 +1401,11 @@ documentation is found."
;; Need to save and restore 'hbut:current here
;; since `hywiki-get-definition' overwrites it
(progn (hattr:copy 'hbut:current 'saved-but)
(setq def (hywiki-get-definition
(ibut:key-to-label lbl-key)))
(when (stringp def)
(terpri)
(princ def)))
(let ((def (hywiki-get-definition
(ibut:key-to-label lbl-key))))
(when (stringp def)
(terpri)
(princ def))))
(hattr:copy 'saved-but 'hbut:current)))

(unless (or assisting
Expand Down
10 changes: 5 additions & 5 deletions hyrolo.el
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
;; Author: Bob Weiner
;;
;; Orig-Date: 7-Jun-89 at 22:08:29
;; Last-Mod: 29-Aug-26 at 23:35:44 by Bob Weiner
;; Last-Mod: 12-Sep-26 at 13:57:08 by Mats Lidell
;;
;; SPDX-License-Identifier: GPL-3.0-or-later
;;
Expand Down Expand Up @@ -842,6 +842,10 @@ If ARG is zero, move to the beginning of the current line."
;; `hyrolo-file-list', so expand it.
(hyrolo-expand-path-list hyrolo-file-list)))

(defsubst hyrolo-hdr-at-p ()
"Return pos if point is at the start of a `hyrolo-mode' file header, else nil."
(text-property-any (point) (1+ (point)) :hyrolo-hdr t))

;;;###autoload
(defun hyrolo-get-entry (name &optional regexp-flag exclude-sub-entries)
"Return the first rolo entry string with a headline containing NAME.
Expand Down Expand Up @@ -2035,10 +2039,6 @@ only (first line of entries), rather than entire entries.
Return number of matching entries found."
(hyrolo-grep-file hyrolo-file-or-buf (regexp-quote string) max-matches count-only headline-only))

(defsubst hyrolo-hdr-at-p ()
"Return pos if point is at the start of a `hyrolo-mode' file header, else nil."
(text-property-any (point) (1+ (point)) :hyrolo-hdr t))

(defun hyrolo-hdr-in-p ()
"If point is within a file header, return t, else nil."
(or (looking-at hyrolo-hdr-regexp)
Expand Down