ndwarshuis
/
org-mode
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

This commit is contained in:
Carsten Dominik 2010-10-22 09:20:05 +02:00
parent ca991d2ad4 8d85a67deb
commit 9dc28ea0ed
2 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lisp/ob-R.el
View File

@ -53,7 +53,7 @@
(defun org-babel-expand-body:R (body params) (defun org-babel-expand-body:R (body params)
"Expand BODY according to PARAMS, return the expanded body." "Expand BODY according to PARAMS, return the expanded body."
(let (out-file (cdr (assoc :file params))) (let ((out-file (cdr (assoc :file params))))
(mapconcat (mapconcat
#'identity #'identity
((lambda (inside) ((lambda (inside)

5
lisp/org-exp.el
View File

@ -1831,6 +1831,9 @@ Also, store forcedalignment information found in such lines."
nodesc) nodesc)
(goto-char (point-min)) (goto-char (point-min))
(while (re-search-forward re-plain-link nil t) (while (re-search-forward re-plain-link nil t)
(unless (org-string-match-p
"\\[\\[\\S+:\\S-*?\\<"
(buffer-substring (point-at-bol) (match-beginning 0)))
(goto-char (1- (match-end 0))) (goto-char (1- (match-end 0)))
(org-if-unprotected-at (1+ (match-beginning 0)) (org-if-unprotected-at (1+ (match-beginning 0))
(let* ((s (concat (match-string 1) (let* ((s (concat (match-string 1)
@ -1840,7 +1843,7 @@ Also, store forcedalignment information found in such lines."
"]]"))) "]]")))
;; added 'org-link face to links ;; added 'org-link face to links
(put-text-property 0 (length s) 'face 'org-link s) (put-text-property 0 (length s) 'face 'org-link s)
(replace-match s t t)))) (replace-match s t t)))))
(goto-char (point-min)) (goto-char (point-min))
(while (re-search-forward re-angle-link nil t) (while (re-search-forward re-angle-link nil t)
(goto-char (1- (match-end 0))) (goto-char (1- (match-end 0)))