summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYuchen Pei <me@ypei.me>2021-08-12 10:30:05 +1000
committerYuchen Pei <me@ypei.me>2021-08-12 10:30:05 +1000
commit5293fda690c04309bb4e48b6e8a5d8307ffeeff2 (patch)
tree4ddabc351c06b70945a7757805ea593170632256
parentdf527c5e6dc498b6cad643aebb7a955e40f6de80 (diff)
parent74e35ba4d4cda486a664c44195b72425a2233c81 (diff)
Merge remote-tracking branch 'upstream/org' into org
-rw-r--r--rt-liberation-org.el48
1 files changed, 14 insertions, 34 deletions
diff --git a/rt-liberation-org.el b/rt-liberation-org.el
index 8fdc3c9..0f58a64 100644
--- a/rt-liberation-org.el
+++ b/rt-liberation-org.el
@@ -22,63 +22,44 @@
;; Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
;; MA 02111-1307, USA.
-;;; Installation and Use:
-;;
-;; Detailed instructions for installation and use can be found in the
-;; rt-liberation manual, in the doc/ directory of the distribution.
-
-;;; History:
-;;
-;; Started near the end of 2008.
(require 'org)
+(require 'rt-liberation)
(defun rt-org-open (link)
"Opens the rt LINK.
Open the rt ticket (for links starting with 'id:') or run
the query (for links starting with 'query:')."
- (require 'rt-liberation)
(cond
((string-match "^id:\\([^/]+\\)\\(/\\(.+\\)\\)?" link)
- (let (
- (id (match-string 1 link))
- (history-id (match-string 3 link))
- )
+ (let ((id (match-string 1 link))
+ (history-id (match-string 3 link)))
(rt-liber-browse-query (format "id = \"%s\"" id))
(rt-liber-browser-move-point-to-ticket id)
(rt-liber-ticket-at-point)
(if history-id
- (let (
- (current-history-id (alist-get 'id (rt-liber-viewer2-get-section-data)))
- (previous-history-id nil)
- )
+ (let ((current-history-id (alist-get 'id (rt-liber-viewer2-get-section-data)))
+ (previous-history-id nil))
(while (not (or (string-equal history-id current-history-id)
(eq current-history-id previous-history-id)))
(setq previous-history-id current-history-id)
(rt-liber-viewer2-next-section-in)
- (setq current-history-id (alist-get 'id (rt-liber-viewer2-get-section-data)))
- )
- ))))
+ (setq current-history-id (alist-get 'id (rt-liber-viewer2-get-section-data))))))))
((string-match "^query:\\(.+\\)" link)
(rt-liber-browse-query (match-string 1 link)))
- (t (error "Unrecognized link type '%s'" link))
- ))
+ (t (error "Unrecognized link type '%s'" link))))
(defun rt-org-store-link ()
"Stores an rt link in ticket-browser or ticker-viewer mode."
- (require 'rt-liberation)
(let ((ticket (or (get-text-property (point) 'rt-ticket)
rt-liber-ticket-local)))
(when ticket
- (let* (
- (ticket-id-link (concat "rt:id:" (rt-liber-ticket-id-only ticket)))
+ (let* ((ticket-id-link (concat "rt:id:" (rt-liber-ticket-id-only ticket)))
(subject (cdr (assoc "Subject" ticket)))
(history-id (alist-get 'id (rt-liber-viewer2-get-section-data)))
- (link (concat ticket-id-link (if history-id (concat "/" history-id) "")))
- )
+ (link (concat ticket-id-link (if history-id (concat "/" history-id) ""))))
(org-link-add-props
:link link
- :description subject
- )
+ :description subject)
link))))
;; org-add-link-type is obsolete as of org-mode 9. Instead we will use the
@@ -86,11 +67,10 @@
(if (fboundp 'org-link-set-parameters)
(org-link-set-parameters "rt"
:follow #'rt-org-open
- :store #'rt-org-store-link
- )
- (org-add-link-type "rt" rt-org-open)
- (add-hook 'org-store-link-functions 'rt-org-store-link)
- )
+ :store #'rt-org-store-link)
+ (org-add-link-type "rt" #'rt-org-open)
+ (add-hook 'org-store-link-functions 'rt-org-store-link))
+
;;; _
(provide 'rt-liberation-org)