summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNicolas Goaziou <mail@nicolasgoaziou.fr>2016-01-09 17:04:26 +0100
committerNicolas Goaziou <mail@nicolasgoaziou.fr>2016-01-09 17:04:26 +0100
commite0d3944985acdd710e6fa47e6d0cc189a21cf49e (patch)
treed29cd5a08b01a11da1696e9ef8cbafe78d6d30b2
parent0468ca8529df384edec5d1312840a70a55ef13ea (diff)
downloadorg-mode-e0d3944985acdd710e6fa47e6d0cc189a21cf49e.tar.gz
Fix escaping in capture, part 2
* lisp/org-capture.el (org-capture-fill-template): * lisp/org-feed.el (org-feed-format-entry): Fix wrong argument in `replace-regexp-in-string'.
-rw-r--r--lisp/org-capture.el3
-rw-r--r--lisp/org-feed.el2
2 files changed, 2 insertions, 3 deletions
diff --git a/lisp/org-capture.el b/lisp/org-capture.el
index cbae91c..86d082f 100644
--- a/lisp/org-capture.el
+++ b/lisp/org-capture.el
@@ -1672,8 +1672,7 @@ The template may still contain \"%?\" for cursor positioning."
(?x v-x))))
(insert
(if (org-capture-inside-embedded-elisp-p)
- (replace-regexp-in-string
- "\"" "\\\\\"" replacement nil t)
+ (replace-regexp-in-string "\"" "\\\\\"" replacement)
replacement))))))))
;; Expand %() embedded Elisp. Limit to Sexp originally marked.
diff --git a/lisp/org-feed.el b/lisp/org-feed.el
index d11265e..3d91062 100644
--- a/lisp/org-feed.el
+++ b/lisp/org-feed.el
@@ -565,7 +565,7 @@ If that property is already present, nothing changes."
(insert
;; Escape string delimiters within embedded lisp.
(if (org-capture-inside-embedded-elisp-p)
- (replace-regexp-in-string "\"" "\\\\\"" replacement nil t)
+ (replace-regexp-in-string "\"" "\\\\\"" replacement)
replacement)))))))
;; %() embedded elisp