emacs-orgmode
[Top][All Lists]
Advanced

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

[Orgmode] [PATCH] Fix link display in imenus and the refile interface


From: James TD Smith
Subject: [Orgmode] [PATCH] Fix link display in imenus and the refile interface
Date: Sun, 21 Sep 2008 15:31:23 +0100
User-agent: StGIT/0.14.2

I've fixed both problems. 

Replace links with their descriptions in when generating the items for imenus
and the refile interface. For links with no description the link target is used
instead.
---

 lisp/ChangeLog     |    6 ++++++
 lisp/org-compat.el |    2 +-
 lisp/org.el        |   16 ++++++++++++++--
 3 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 56e290e..9fe09d1 100755
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2008-09-21  James TD Smith  <address@hidden>
+
+       * org.el (org-get-refile-targets): Replace links with their
+       descriptions
+       (org-imenu-get-tree): Replace links with their descriptions
+
 2008-09-20  James TD Smith  <address@hidden>
 
        * org-remember.el (org-remember-apply-template): Add a new
diff --git a/lisp/org-compat.el b/lisp/org-compat.el
index b4d2660..dc8d9cb 100644
--- a/lisp/org-compat.el
+++ b/lisp/org-compat.el
@@ -261,7 +261,7 @@ that can be added."
   (if (featurep 'xemacs)
       (add-text-properties 0 (length string) properties string)
     (apply 'propertize string properties)))
- 
+
 (provide 'org-compat)
 
 ;; arch-tag: a0a0579f-e68c-4bdf-9e55-93768b846bbe
diff --git a/lisp/org.el b/lisp/org.el
index b1f6829..74a2a11 100644
--- a/lisp/org.el
+++ b/lisp/org.el
@@ -7866,7 +7866,7 @@ on the system \"/address@hidden:\"."
                (while (re-search-forward descre nil t)
                  (goto-char (point-at-bol))
                  (when (looking-at org-complex-heading-regexp)
-                   (setq txt (match-string 4)
+                   (setq txt (org-link-display-format (match-string 4))
                          re (concat "^" (regexp-quote
                                          (buffer-substring (match-beginning 1)
                                                            (match-end 4)))))
@@ -14676,7 +14676,8 @@ Show the heading too, if it is currently invisible."
          (setq level (org-reduced-level (funcall outline-level)))
          (when (<= level n)
            (looking-at org-complex-heading-regexp)
-           (setq head (org-match-string-no-properties 4)
+           (setq head (org-link-display-format
+                       (org-match-string-no-properties 4))
                  m (org-imenu-new-marker))
            (org-add-props head nil 'org-imenu-marker m 'org-imenu t)
            (if (>= level last-level)
@@ -14693,6 +14694,17 @@ Show the heading too, if it is currently invisible."
                 (if (eq major-mode 'org-mode)
                     (org-show-context 'org-goto))))))
 
+(defun org-link-display-format (link)
+  "Replace a link with either the description, or the link target
+if no description is present"
+  (save-match-data
+    (if (string-match org-bracket-link-analytic-regexp link)
+       (replace-match (or (match-string 5 link)
+                          (concat (match-string 1 link)
+                                  (match-string 3 link)))
+                      nil nil link)
+      link)))
+
 ;; Speedbar support
 
 (defvar org-speedbar-restriction-lock-overlay (org-make-overlay 1 1)





reply via email to

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