branch: externals/hyperbole
commit 39d89c10d0874874f7d12b0d8af6a8e9a22c72b8
Author: bw <[email protected]>
Commit: bw <[email protected]>
hyperbole.el (hkey-initialize): Bind {M-o} only if no curr binding
---
ChangeLog | 3 +++
hyperbole.el | 16 +++++++---------
2 files changed, 10 insertions(+), 9 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index ebb6820aa77..8c9ebb7ef7c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
2026-07-10 Bob Weiner <[email protected]>
+* hyperbole.el (hkey-initialize): Change to bind {M-o} in 'hyperbole-mode-map'
+ only if not previously bound.
+
* hywiki.el (hywiki-referent-menu): Add Denote support.
(hywiki-add-denote, hywiki-display-denote,
hywiki-string-to-wikiword)
hywiki-denote-file-to-wikiword, hywiki-denote-id-to-wikiword): Add
diff --git a/hyperbole.el b/hyperbole.el
index 8bb742729b3..d4d66e5fce7 100644
--- a/hyperbole.el
+++ b/hyperbole.el
@@ -9,7 +9,7 @@
;; Maintainer: Robert Weiner <[email protected]>
;; Maintainers: Robert Weiner <[email protected]>, Mats Lidell <[email protected]>
;; Created: 06-Oct-92 at 11:52:51
-;; Last-Mod: 9-Jun-26 at 10:58:22 by Bob Weiner
+;; Last-Mod: 10-Jul-26 at 14:20:25 by Bob Weiner
;; Released: 10-Mar-24
;; Version: 9.0.2pre
;; Keywords: comm, convenience, files, frames, hypermedia, languages,
mail, matching, mouse, multimedia, outlines, tools, wp
@@ -285,14 +285,12 @@ of the commands."
;; Provide a site standard way of emulating most Hyperbole mouse drag
;; commands from the keyboard. This is most useful for rapidly creating
;; Hyperbole link buttons from the keyboard without invoking the Hyperbole
- ;; menu. Works only if Hyperbole is run under a window system.
- (when (hyperb:window-system)
- (if (eq (global-key-binding "\M-o") #'facemenu-keymap)
- ;; Override facemenu package that adds a keymap on M-o,
- ;; since this binding is more important to Hyperbole
- ;; users.
- (hkey-set-key "\M-o" #'hkey-operate)
- (hkey-maybe-set-key "\M-o" #'hkey-operate)))
+ ;; menu. Works only if Hyperbole is run under a window system. Less
+ ;; important to bind now that {C-h h i l} exists to create implicit
+ ;; links between two windows, so we only bind {M-o} here if it has no
+ ;; global binding prior to Hyperbole being loaded.
+ (when (and (hyperb:window-system) (not (key-binding "\M-o")))
+ (hkey-maybe-set-key "\M-o" #'hkey-operate))
;;
;; Explicit button renames without invoking the Hyperbole menu.
;; No binding by default.
