Skip to content

prepare for emacs 31 #968

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
matsl merged 5 commits into from
Jun 5, 2026
Merged

prepare for emacs 31 #968

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
bf2035a
Handle functions marked as obsolete in Emacs 31
matsl Jun 5, 2026
50683bd
Add type and group to defcustom
matsl Jun 5, 2026
1d863e6
Declare used functions
matsl Jun 5, 2026
dc270be
Add ChangeLog
matsl Jun 5, 2026
803bcb0
Insert function declaration in alphabet order
matsl Jun 5, 2026
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
13 changes: 13 additions & 0 deletions ChangeLog
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,16 @@
2026-06-05 Mats Lidell <[email protected]>

* hui.el (kcell-view:label): Declare function.
(hui:copy-message-length): Use type and group.

* hypb.el (smart-ancestor-tag-files): Declare function.

* hui-mouse.el (smart-calendar, smart-calendar-assist): Use
calendar-scroll-calendar-right and calendar-scroll-calendar-left.

* hywiki.el (hywiki-org-format-heading): Use
org-fold-core-remove-optimization.

2026-06-04 Bob Weiner <[email protected]>

* hibtypes.el (hib-python-traceback, debugger-source): Fix 2nd regexp in
Expand Down
20 changes: 16 additions & 4 deletions hui-mouse.el
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -889,9 +889,15 @@ If key is pressed:

(interactive)
(cond ((smart-eobp) (calendar-cursor-to-nearest-date)
(calendar-scroll-left-three-months 1))
(if (fboundp 'calendar-scroll-calendar-left)
(calendar-scroll-calendar-left)
(with-suppressed-warnings ((obsolete calendar-scroll-left-three-months))
(calendar-scroll-left-three-months 1))))
((< (current-column) 5) (calendar-cursor-to-nearest-date)
(calendar-scroll-right-three-months 1))
(if (fboundp 'calendar-scroll-calendar-right)
(calendar-scroll-calendar-right)
(with-suppressed-warnings ((obsolete calendar-scroll-right-three-months))
(calendar-scroll-right-three-months 1))))
(t (calendar-cursor-to-nearest-date)
(diary-view-entries 1))))

Expand All @@ -911,9 +917,15 @@ If assist key is pressed:

(interactive)
(cond ((smart-eobp) (calendar-cursor-to-nearest-date)
(calendar-scroll-right-three-months 1))
(if (fboundp 'calendar-scroll-calendar-left)
(calendar-scroll-calendar-left)
(with-suppressed-warnings ((obsolete calendar-scroll-left-three-months))
(calendar-scroll-left-three-months 1))))
((< (current-column) 5) (calendar-cursor-to-nearest-date)
(calendar-scroll-left-three-months 1))
(if (fboundp 'calendar-scroll-calendar-right)
(calendar-scroll-calendar-right)
(with-suppressed-warnings ((obsolete calendar-scroll-right-three-months))
(calendar-scroll-right-three-months 1))))
(t (diary-mark-entries))))

;;; ************************************************************************
Expand Down
5 changes: 4 additions & 1 deletion hui.el
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@
(declare-function hywiki-referent-exists-p "hywiki")
(declare-function kcell-view:absolute-reference "kotl/kview")
(declare-function kcell-view:idstamp "kotl/kview")
(declare-function kcell-view:label "kotl/kview")
(declare-function klink:absolute "kotl/klink")
(declare-function klink:at-p "kotl/klink")
(declare-function kotl-mode "kotl/kotl-mode")
Expand All @@ -64,7 +65,9 @@

(defcustom hui:copy-message-length 40
"Maximum character length of the message displayed after copying text.
Set to 0 for no message.")
Set to 0 for no message."
:type 'integer
:group 'hyperbole-buttons)

(defcustom hui:ebut-prompt-for-action nil
"Non-nil prompts for a button-specific action on explicit button creation."
Expand Down
1 change: 1 addition & 0 deletions hypb.el
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,7 @@

(defvar hsys-org-enable-smart-keys) ; "hsys-org.el"
(declare-function kview:char-invisible-p "kotl/kview")
(declare-function smart-ancestor-tag-files "hmouse-tag")
Comment thread
matsl marked this conversation as resolved.
(declare-function smart-eobp "hui-mouse")

;;; ************************************************************************
Expand Down
10 changes: 8 additions & 2 deletions hywiki.el
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3426,7 +3426,10 @@ When NO-STATS is non-nil, don't include statistics in square brackets."
;; When using `org-fold-core--optimise-for-huge-buffers',
;; returned text will be invisible. Clear it up.
(save-match-data
(org-fold-core-remove-optimisation (match-beginning 0) (match-end 0)))
(if (fboundp 'org-fold-core-remove-optimization)
(org-fold-core-remove-optimization (match-beginning 0) (match-end 0))
(with-suppressed-warnings ((obsolete org-fold-core-remove-optimisation))
(org-fold-core-remove-optimisation (match-beginning 0) (match-end 0)))))
(let ((todo (and (not no-todo) (match-string 2 heading)))
(priority (and (not no-priority) (match-string 3 heading)))
(headline (pcase (match-string 4 heading)
Expand All @@ -3446,7 +3449,10 @@ When NO-STATS is non-nil, don't include statistics in square brackets."
"\\(?: +\\[[0-9%+/]+\\]\\)+" "" headline)))

;; Restore cleared optimization.
(org-fold-core-update-optimisation (match-beginning 0) (match-end 0))
(if (fboundp 'org-fold-core-remove-optimization)
(org-fold-core-remove-optimization (match-beginning 0) (match-end 0))
(with-suppressed-warnings ((obsolete org-fold-core-remove-optimisation))
(org-fold-core-remove-optimisation (match-beginning 0) (match-end 0))))
(mapconcat #'identity
(delq nil (list todo priority headline tags))
" "))))))
Expand Down