Merge branch 'master' of git+ssh://repo.or.cz/srv/git/org-mode

2 files changed, 14 insertions, 11 deletions

diff --git a/lisp/ob-R.el b/lisp/ob-R.el
index a2b9925..339be23 100644
--- a/lisp/ob-R.el
+++ b/lisp/ob-R.el
@@ -53,7 +53,7 @@
 
 (defun org-babel-expand-body:R (body params)
   "Expand BODY according to PARAMS, return the expanded body."
-  (let (out-file (cdr (assoc :file params)))
+  (let ((out-file (cdr (assoc :file params))))
     (mapconcat
      #'identity
      ((lambda (inside)
diff --git a/lisp/org-exp.el b/lisp/org-exp.el
index 5d552f7..36a5d99 100644
--- a/lisp/org-exp.el
+++ b/lisp/org-exp.el
@@ -1831,16 +1831,19 @@ Also, store forcedalignment information found in such lines."
 	nodesc)
     (goto-char (point-min))
     (while (re-search-forward re-plain-link nil t)
-      (goto-char (1- (match-end 0)))
-      (org-if-unprotected-at (1+ (match-beginning 0))
-       (let* ((s (concat (match-string 1)
-			 "[[" (match-string 2) ":" (match-string 3)
-			 "][" (match-string 2) ":" (org-export-protect-sub-super
-						    (match-string 3))
-			 "]]")))
-	 ;; added 'org-link face to links
-	 (put-text-property 0 (length s) 'face 'org-link s)
-	 (replace-match s t t))))
+      (unless (org-string-match-p
+	       "\\[\\[\\S+:\\S-*?\\<"
+	       (buffer-substring (point-at-bol) (match-beginning 0)))
+	(goto-char (1- (match-end 0)))
+	(org-if-unprotected-at (1+ (match-beginning 0))
+	  (let* ((s (concat (match-string 1)
+			    "[[" (match-string 2) ":" (match-string 3)
+			    "][" (match-string 2) ":" (org-export-protect-sub-super
+						       (match-string 3))
+			    "]]")))
+	    ;; added 'org-link face to links
+	    (put-text-property 0 (length s) 'face 'org-link s)
+	    (replace-match s t t)))))
     (goto-char (point-min))
     (while (re-search-forward re-angle-link nil t)
       (goto-char (1- (match-end 0)))