emacs-elpa-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[elpa] externals/hyperbole 305858f: Fix smart-org with EOL, Org link and


From: ELPA Syncer
Subject: [elpa] externals/hyperbole 305858f: Fix smart-org with EOL, Org link and radio target additions
Date: Sun, 2 May 2021 18:57:08 -0400 (EDT)

branch: externals/hyperbole
commit 305858f74e47ad06e8e62d0d546d916ad150d143
Author: Bob Weiner <rsw@gnu.org>
Commit: Bob Weiner <rsw@gnu.org>

    Fix smart-org with EOL, Org link and radio target additions
---
 ChangeLog    |  4 ++--
 hui-mouse.el | 20 +++++++++++++++-----
 2 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 67d184f..2504042 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -25,8 +25,8 @@
   hui-mouse.el (action-key-error, assist-key-error): When in Org mode,
     if no other context fired, use org-meta-return.
   hsys-org.el (hsys-org-heading-at-p): Add to support Hyperbole
-    EOL handling and use in smart-org.
-
+    EOL handling and use in smart-org.  Also when hsys-org-enable-smart-keys
+    is 'buttons, follow Org links and radio targets.
 
 * kotl/kotl-mode.el (kotl-mode:kill-whole-line): Add override
     of kill-whole-line for Koutliner.
diff --git a/hui-mouse.el b/hui-mouse.el
index c9b9e10..811d56a 100644
--- a/hui-mouse.el
+++ b/hui-mouse.el
@@ -1638,11 +1638,21 @@ handled by the separate implicit button type, 
`org-link-outside-org-mode'."
                    ;; Continue with any further Smart Key non-Org contexts
                    nil))))
          ((eq hsys-org-enable-smart-keys 'buttons)
-          (when (hbut:at-p)
-            ;; Activate/Assist with any Hyperbole button at point
-            (if (not assist-flag)
-                (hact 'hbut:act)
-              (hact 'hkey-help)))
+          (cond ((hsys-org-radio-target-def-at-p)
+                 (hact 'org-radio-target)
+                 t)
+                ((setq start-end (hsys-org-link-at-p))
+                 (if (not assist-flag)
+                     (progn (hsys-org-set-ibut-label start-end)
+                            (hact 'org-link))
+                   (hact 'hkey-help))
+                 t)
+                ((hbut:at-p)
+                 ;; Activate/Assist with any Hyperbole button at point
+                 (if (not assist-flag)
+                     (hact 'hbut:act)
+                   (hact 'hkey-help)))
+                (t (hact 'org-meta-return current-prefix-arg)))
           ;; Ignore any further Smart Key non-Org contexts
           t)
          (t



reply via email to

[Prev in Thread] Current Thread [Next in Thread]