summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Maus <dmaus@ictsoc.de>2011-09-11 16:50:22 +0200
committerDavid Maus <dmaus@ictsoc.de>2011-09-11 16:51:23 +0200
commit4122a51366ad83ecea27c9df45dea9d89a538797 (patch)
tree1f32d9cc58fc9a39d1096f9369ed07cf1112f0e4
parent5a373f649e19155cab9fd43c0b22c86446a70ebf (diff)
downloadorg-mode-4122a51366ad83ecea27c9df45dea9d89a538797.tar.gz
Unescape plain link before open
* org.el (org-open-at-point): Unescape plain link. This should fix a problem with open plain links reported by Sebastien Vauban.
-rw-r--r--lisp/org.el15
1 files changed, 8 insertions, 7 deletions
diff --git a/lisp/org.el b/lisp/org.el
index d5bef6f..73b1073 100644
--- a/lisp/org.el
+++ b/lisp/org.el
@@ -365,10 +365,10 @@ In Emacs 23, when `shift-select-mode' is on, shifted cursor keys
start selecting a region, or enlarge regions started in this way.
In Org-mode, in special contexts, these same keys are used for
other purposes, important enough to compete with shift selection.
-Org tries to balance these needs by supporting `shift-select-mode'
+Org tries to balance these needs by supporting `shift-select-mode'
outside these special contexts, under control of this variable.
-The default of this variable is nil, to avoid confusing behavior. Shifted
+The default of this variable is nil, to avoid confusing behavior. Shifted
cursor keys will then execute Org commands in the following contexts:
- on a headline, changing TODO state (left/right) and priority (up/down)
- on a time stamp, changing the time
@@ -9392,7 +9392,8 @@ application the system uses for this file type."
(save-excursion
(when (or (org-in-regexp org-angle-link-re)
(org-in-regexp org-plain-link-re))
- (setq type (match-string 1) path (match-string 2))
+ (setq type (match-string 1)
+ path (org-link-unescape (match-string 2)))
(throw 'match t)))
(save-excursion
(when (org-in-regexp (org-re "\\(:[[:alnum:]_@#%:]+\\):[ \t]*$"))
@@ -9999,8 +10000,8 @@ If the file does not exist, an error is thrown."
match)
(progn (setq in-emacs (or in-emacs line search))
nil))) ; if we have no match in apps-dlink,
- ; always open the file in emacs if line or search
- ; is given (for backwards compatibility)
+ ; always open the file in emacs if line or search
+ ; is given (for backwards compatibility)
(assoc-default dfile (org-apps-regexp-alist apps a-m-a-p)
'string-match)
(cdr (assoc ext apps))
@@ -17089,7 +17090,7 @@ If not, return to the original position and throw an error."
(defun org-speed-command-default-hook (keys)
"Hook for activating single-letter speed commands.
-`org-speed-commands-default' specifies a minimal command set.
+`org-speed-commands-default' specifies a minimal command set.
Use `org-speed-commands-user' for further customization."
(when (or (and (bolp) (looking-at org-outline-regexp))
(and (functionp org-use-speed-commands)
@@ -20504,7 +20505,7 @@ if no description is present"
(progn (org-remove-from-invisibility-spec '(org-link))
(org-restart-font-lock)
(setq org-descriptive-links nil))
- (progn (add-to-invisibility-spec '(org-link))
+ (progn (add-to-invisibility-spec '(org-link))
(org-restart-font-lock)
(setq org-descriptive-links t))))