diff options
| author | Carsten Dominik | 2006-03-21 13:36:56 +0000 |
|---|---|---|
| committer | Carsten Dominik | 2006-03-21 13:36:56 +0000 |
| commit | c0434d3b46c55c7128b2f80e7b908348b22c1eb8 (patch) | |
| tree | 48e48a8adbee719d78c88811e51f2c50c8482063 | |
| parent | 9ed8b6cb4a091fe2f7d8330f0fa69b151fd8e77c (diff) | |
| download | emacs-c0434d3b46c55c7128b2f80e7b908348b22c1eb8.tar.gz emacs-c0434d3b46c55c7128b2f80e7b908348b22c1eb8.zip | |
(org-open-at-point): Fixed bug in wiki-style bracket links.
| -rw-r--r-- | lisp/ChangeLog | 2 | ||||
| -rw-r--r-- | lisp/textmodes/org.el | 8 |
2 files changed, 7 insertions, 3 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 3cf352ce757..4c325e968ca 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | 2006-03-21 Carsten Dominik <dominik@science.uva.nl> | 1 | 2006-03-21 Carsten Dominik <dominik@science.uva.nl> |
| 2 | 2 | ||
| 3 | * textmodes/org.el: (org-open-at-point): Fixed bug in wiki-stype | 3 | * textmodes/org.el: (org-open-at-point): Fixed bug in wiki-style |
| 4 | bracket links. | 4 | bracket links. |
| 5 | 5 | ||
| 6 | 2006-03-21 Kim F. Storm <storm@cua.dk> | 6 | 2006-03-21 Kim F. Storm <storm@cua.dk> |
diff --git a/lisp/textmodes/org.el b/lisp/textmodes/org.el index a00a1b247e8..ad4744adf15 100644 --- a/lisp/textmodes/org.el +++ b/lisp/textmodes/org.el | |||
| @@ -6833,8 +6833,8 @@ optional argument IN-EMACS is non-nil, Emacs will visit the file." | |||
| 6833 | (while (string-match " *\n *" link) | 6833 | (while (string-match " *\n *" link) |
| 6834 | (setq link (replace-match " " t t link))) | 6834 | (setq link (replace-match " " t t link))) |
| 6835 | (if (string-match org-link-regexp link) | 6835 | (if (string-match org-link-regexp link) |
| 6836 | (setq type (match-string 1) | 6836 | (setq type (match-string 1 link) |
| 6837 | path (match-string 2)) | 6837 | path (match-string 2 link)) |
| 6838 | (setq type "thisfile" | 6838 | (setq type "thisfile" |
| 6839 | path link)) | 6839 | path link)) |
| 6840 | (throw 'match t))) | 6840 | (throw 'match t))) |
| @@ -6893,6 +6893,10 @@ optional argument IN-EMACS is non-nil, Emacs will visit the file." | |||
| 6893 | 6893 | ||
| 6894 | (cond | 6894 | (cond |
| 6895 | 6895 | ||
| 6896 | ((member type '("http" "https" "ftp" "mailto" "news")) | ||
| 6897 | ;; give these to some browser | ||
| 6898 | (browse-url (concat type ":" path))) | ||
| 6899 | |||
| 6896 | ((string= type "tags") | 6900 | ((string= type "tags") |
| 6897 | (org-tags-view in-emacs path)) | 6901 | (org-tags-view in-emacs path)) |
| 6898 | ((or (string= type "camel") | 6902 | ((or (string= type "camel") |