Forráskód Böngészése

ol: Fix opening file link with a starred search option

* lisp/ol.el (org-link-open-as-file): Fix logic so initial regexp is
matched against the file-name only, not the search option.
Nicolas Goaziou 5 éve
szülő
commit
7707f898a1
1 módosított fájl, 7 hozzáadás és 7 törlés
  1. 7 7
      lisp/ol.el

+ 7 - 7
lisp/ol.el

@@ -1269,14 +1269,14 @@ search options, separated from the file name with \"::\".
 
 This function is meant to be used as a possible tool for
 `:follow' property in `org-link-parameters'."
-  (if (string-match "[*?{]" (file-name-nondirectory path))
-      (dired path)
-    (let* ((option (and (string-match "::\\(.*\\)\\'" path)
-			(match-string 1 path)))
-	   (path (if (not option) path
-		   (substring path 0 (match-beginning 0)))))
+  (let* ((option (and (string-match "::\\(.*\\)\\'" path)
+		      (match-string 1 path)))
+	 (file-name (if (not option) path
+		      (substring path 0 (match-beginning 0)))))
+    (if (string-match "[*?{]" (file-name-nondirectory file-name))
+	(dired file-name)
       (apply #'org-open-file
-	     path
+	     file-name
 	     arg
 	     (cond ((not option) nil)
 		   ((string-match-p "\\`[0-9]+\\'" option)