mirror/org-mode
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs/org-mode.git synced 2024-12-27 10:55:04 +00:00
Code

Simplyfy links in imenu and refile display.

Browse Source 
Patch by James TD Smith.
This commit is contained in:
Carsten Dominik 2008-09-21 21:39:28 +02:00
parent d6d72b3436
commit d670d20af2
3 changed files with 21 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lisp/ChangeLog
View File

@ -1,5 +1,9 @@
2008-09-20 James TD Smith <ahktenzero@mohorovi.cc>
* org.el (org-get-refile-targets): Replace links with their
descriptions
(org-imenu-get-tree): Replace links with their descriptions.
* org-remember.el (org-remember-apply-template): Add a new
expansion for adding properties to remember items.

2
lisp/org-compat.el
View File

@ -30,6 +30,8 @@
;;; Code:
(require 'org-macs)
(defconst org-xemacs-p (featurep 'xemacs)) ; not used by org.el itself
(defconst org-format-transports-properties-p
(let ((x "a"))

17
lisp/org.el
View File

@ -7866,7 +7866,7 @@ on the system \"/user@host:\"."
(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)))))
@ -9037,6 +9037,7 @@ This is done in the same way as adding a state change note."
(interactive)
(org-add-log-setup 'note nil 'findpos nil))
(defvar org-property-end-re)
(defun org-add-log-setup (&optional purpose state findpos how &optional extra)
"Set up the post command hook to take a note.
If this is about to TODO state change, the new state is expected in STATE.
@ -14676,7 +14677,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 +14695,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)