Skip to content

hash-merge - Fix `hash-map' call so stores symbol keys, not strings #976

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
rswgnu merged 2 commits into from
Jun 16, 2026
Merged

hash-merge - Fix `hash-map' call so stores symbol keys, not strings #976

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
97d60f6
hash-merge - Fix `hash-map' call so stores symbol keys, not strings
rswgnu Jun 16, 2026
e1c423e
Merge branch 'master' into rsw
rswgnu Jun 16, 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
7 changes: 7 additions & 0 deletions ChangeLog
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,10 @@
2026-06-16 Bob Weiner <rsw@gnu.org>

* hasht.el (hash-merge): Fix call to hash-map which was not treating its
input as string-keys. This led to HyWiki hash tables having string keys
rather than symbol keys whenever a non-page referent HyWiki word was read
in from the file where it was saved.

2026-06-14 Bob Weiner <rsw@gnu.org>

* hactypes.el (link-to-ibut): Fix infinite loop in <ilink:label> by preventing
Expand Down
8 changes: 4 additions & 4 deletions hasht.el
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
;; Author: Bob Weiner
;;
;; Orig-Date: 16-Mar-90 at 03:38:48
;; Last-Mod: 17-Feb-26 at 22:42:00 by Bob Weiner
;; Last-Mod: 16-Jun-26 at 09:40:09 by Bob Weiner
;;
;; SPDX-License-Identifier: GPL-3.0-or-later
;;
Expand Down Expand Up @@ -257,9 +257,9 @@ whose keys are the same."
key value)
(mapc
(lambda (ht)
(hash-map (lambda (val-key-cons)
(setq value (car val-key-cons)
key (cdr val-key-cons))
(hash-map (lambda (val-string-key-cons)
(setq value (car val-string-key-cons)
key (intern (cdr val-string-key-cons)))
(if (gethash key htable)
;; Merge values
(puthash
Expand Down
13 changes: 7 additions & 6 deletions hywiki.el
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
;; Author: Bob Weiner
;;
;; Orig-Date: 21-Apr-24 at 22:41:13
;; Last-Mod: 9-Jun-26 at 11:01:49 by Bob Weiner
;; Last-Mod: 15-Jun-26 at 18:10:04 by Bob Weiner
;;
;; SPDX-License-Identifier: GPL-3.0-or-later
;;
Expand Down Expand Up @@ -3355,15 +3355,16 @@ If such an instance is not found, trigger an error."
(setq key (file-name-sans-extension file))
(unless (hash-get key non-page-hasht)
(cons (cons 'page file) key)))
page-files))))
page-files)))
(page-hasht (hash-make page-elts)))
(setq hywiki--referent-hasht
(if non-page-elts
(hash-merge non-page-hasht
(hash-make page-elts))
(hash-make page-elts)))))))
(hash-merge non-page-hasht page-hasht)
page-hasht))))))

(defun hywiki-non-page-elt (val-key)
(unless (eq (caar val-key) 'page) val-key))
(unless (eq (caar val-key) 'page)
val-key))

(defun hywiki--sitemap-file ()
"Return file name for the sitemap file."
Expand Down