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

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

[elpa] externals/org-real 02e1045 5/5: Merge branch 'next' into 'main'


From: ELPA Syncer
Subject: [elpa] externals/org-real 02e1045 5/5: Merge branch 'next' into 'main'
Date: Fri, 15 Oct 2021 10:57:39 -0400 (EDT)

branch: externals/org-real
commit 02e1045f78be53df20ecafc28484f2ea9420bfc6
Merge: 80d49f1 38c7330
Author: Tyler Grinn <tyler@tygr.info>
Commit: Tyler Grinn <tyler@tygr.info>

    Merge branch 'next' into 'main'
    
    v1.0.4
    
    Added autoloads for completing and following a link.
    
    See merge request tygrdev/org-real!15
---
 deps/boxy   |  2 +-
 org-real.el | 10 ++++++----
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/deps/boxy b/deps/boxy
index bda3f52..888e78c 160000
--- a/deps/boxy
+++ b/deps/boxy
@@ -1 +1 @@
-Subproject commit bda3f524f68a962ba36265882df39eafc80b6dfd
+Subproject commit 888e78ce58c5f217c84345b02a5aafd4c9a871b5
diff --git a/org-real.el b/org-real.el
index 670ad09..7d3326c 100644
--- a/org-real.el
+++ b/org-real.el
@@ -3,7 +3,7 @@
 ;; Copyright (C) 2021 Free Software Foundation, Inc.
 
 ;; Author: Tyler Grinn <tylergrinn@gmail.com>
-;; Version: 1.0.3
+;; Version: 1.0.4
 ;; File: org-real.el
 ;; Package-Requires: ((emacs "26.1") (boxy "1.0") (org "9.3"))
 ;; Keywords: tools
@@ -337,6 +337,7 @@ diagram."
                          :follow #'org-real-follow
                          :complete #'org-real-complete)
 
+;;;###autoload
 (defun org-real-follow (url &rest _)
   "Open a real link URL in a popup buffer."
   (let* ((containers (org-real--parse-url url (point-marker)))
@@ -363,6 +364,7 @@ diagram."
              :header (org-real--get-header containers)
              :visibility 0)))
 
+;;;###autoload
 (defun org-real-complete (&optional existing)
   "Complete a real link or edit EXISTING link."
   (let* ((container-matrix (org-real--parse-buffer))
@@ -501,10 +503,10 @@ level."
                 (rel-name (and (slot-boundp prev :name) (with-slots (name) 
prev name)))
                 (verb (if (org-real--is-plural name) " are " " is "))
                 (tooltip (concat "The " name verb rel " the " rel-name ".")))
-      (oset box :tooltip (boxy-fill-tooltip tooltip))
-      (oset box :rel rel))
+      (oset box tooltip (boxy-fill-tooltip tooltip))
+      (oset box rel rel))
     (if (not containers)
-        (unless skip-primary (oset box :primary t))
+        (unless skip-primary (oset box primary t))
       (let ((next-rel (plist-get (car containers) :rel)))
         (cond
          ((member next-rel boxy-children-relationships)



reply via email to

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