branch: externals/hyperbole
commit fffbd7c255e979c7d9c1bfb6963e1f228d0179de
Author: bw <r...@gnu.org>
Commit: bw <r...@gnu.org>
hywiki.el - Fix old/bad function name references
---
ChangeLog | 11 +++++++++++
hibtypes.el | 7 +++++--
hywiki.el | 14 ++++++--------
3 files changed, 22 insertions(+), 10 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index f3bc6ce513..5c1a29157f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2024-05-19 Bob Weiner <r...@gnu.org>
+
+* hibtypes.el (grep-msg): Fix that when no source-loc, file path was not
+ expanded.
+ (find-func): Add require of this library for native compiler
+ grep-msg library name expansion.
+
+* hywiki.el (hywiki-initialize-mode-map): Fix call of old function name.
+ (hywiki-remap-remap-buttonize-characters): Remove extra remap-.
+ (hywiki-find-page): Remove unused let of 'page-buffer'.
+
2024-05-18 Bob Weiner <r...@gnu.org>
* test/hyrolo-tests.el (hyrolo-tests--goto-kotl-header-with-slash-match): Start
diff --git a/hibtypes.el b/hibtypes.el
index d0241216ca..532ac80fe7 100644
--- a/hibtypes.el
+++ b/hibtypes.el
@@ -3,7 +3,7 @@
;; Author: Bob Weiner
;;
;; Orig-Date: 19-Sep-91 at 20:45:31
-;; Last-Mod: 22-Apr-24 at 02:06:09 by Bob Weiner
+;; Last-Mod: 19-May-24 at 03:52:05 by Bob Weiner
;;
;; SPDX-License-Identifier: GPL-3.0-or-later
;;
@@ -38,6 +38,7 @@
;;; ************************************************************************
(require 'cl-lib) ;; for cl-count
+(require 'find-func) ;; used by grep-msg ibtype
(eval-when-compile (require 'hversion))
(require 'hactypes)
(require 'hypb)
@@ -1048,7 +1049,9 @@ in grep and shell buffers."
(hbut:to-key-src t))))
(if (stringp source-loc)
(setq file (expand-file-name file (file-name-directory
source-loc)))
- (setq file (or (hpath:prepend-shell-directory file) file)))
+ (setq file (or (hpath:prepend-shell-directory file)
+ (ignore-errors (find-library-name file))
+ (expand-file-name file))))
(when (file-exists-p file)
(setq line-num (string-to-number line-num))
(ibut:label-set but-label)
diff --git a/hywiki.el b/hywiki.el
index 833a263b38..dbce18d9ae 100644
--- a/hywiki.el
+++ b/hywiki.el
@@ -3,7 +3,7 @@
;; Author: Bob Weiner
;;
;; Orig-Date: 21-Apr-24 at 22:41:13
-;; Last-Mod: 18-May-24 at 20:00:23 by Bob Weiner
+;; Last-Mod: 19-May-24 at 02:05:01 by Bob Weiner
;;
;; SPDX-License-Identifier: GPL-3.0-or-later
;;
@@ -182,8 +182,7 @@ PROMPT-FLAG is 'exists, return nil unless the page already
exists."
(unless (eq prompt-flag 'exists)
(when (y-or-n-p (concat "Create new `"
page-name "' page? "))
(hywiki-add-page page-name)))
- (hywiki-add-page page-name))))
- (page-buffer (and page-file (get-file-buffer page-file))))
+ (hywiki-add-page page-name)))))
(when page-file
(unless in-page-flag (hpath:find (concat page-file section)))
(unless hywiki-mode (hywiki-mode 1))
@@ -236,7 +235,7 @@ Do this only if the expression is an implicit button of
hywiki type."
(when (memq (char-syntax k) '(?. ?_))
(setq result (cons k result)))))))))))
-(defun hywiki-remap-remap-buttonize-characters ()
+(defun hywiki-remap-buttonize-characters ()
"Remap Org self-insert punct/sym keys in `hywiki-mode` to
`hywiki-buttonize`."
(mapc (lambda (c) (define-key hywiki-mode-map (char-to-string c)
'hywiki-buttonize))
hywiki--buttonize-characters))
@@ -244,7 +243,7 @@ Do this only if the expression is an implicit button of
hywiki type."
;; Initialize hywiki-mode-map when null.
(defun hywiki-initialize-mode-map ()
(setq hywiki-mode-map (make-sparse-keymap))
- (hywiki-remap-org-insertion-non-word-keys))
+ (hywiki-remap-buttonize-characters))
(unless hywiki-mode-map
(hywiki-initialize-mode-map))
@@ -383,7 +382,7 @@ the current page unless they have sections attached."
(not executing-kbd-macro)
(not noninteractive))
(save-excursion
- (when (= (char-syntax (char-before)) ?\))
+ ;; (when (= (char-syntax (char-before)) ?\))
;; Clear any HyWikiWord highlighting that may just be a part
;; of a larger balanced delimiter text with multiple words.
;; If there is just a single HyWikiWord, it will be
@@ -393,8 +392,7 @@ the current page unless they have sections attached."
;; (sexp-start (scan-sexps sexp-end -1)))
;; (when sexp-start
;; (hproperty:but-clear-all-in-list
- ;; (hproperty:but-get-all-in-region sexp-start sexp-end 'face
hywiki-word-face)))))
- )
+ ;; (hproperty:but-get-all-in-region sexp-start sexp-end 'face
hywiki-word-face))))))
(unless on-page-name
;; after page name
