summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMattias EngdegÄrd <mattiase@acm.org>2019-03-16 11:36:38 -0700
committerKyle Meyer <kyle@kyleam.com>2019-03-17 22:52:48 -0400
commit574695895403790f8c445d057139117a3d3069fa (patch)
treeb33ead094aba2a41bb64de5a1aecff66df000118
parent7c9bfa142fb8fa981d07fc2454656a8d2399bbcd (diff)
downloadorg-mode-574695895403790f8c445d057139117a3d3069fa.tar.gz
Backport commit 8832cc5f9 from Emacs
* lisp/ob-abc.el (org-babel-expand-body:abc, org-babel-execute:abc): * lisp/ob-forth.el (org-babel-forth-session-execute): Add backslash in regexp for correctness. * lisp/org-list.el (org-plain-list-ordered-item-terminator): Add backslash in doc comment so that it appears as intended. Fix some ineffective backslashes in string literals 8832cc5f91a420db6bea65f381a3fb3597eb7523 Mattias EngdegÄrd Sat Mar 16 11:38:58 2019 -0700
-rw-r--r--lisp/ob-abc.el4
-rw-r--r--lisp/ob-forth.el2
-rw-r--r--lisp/org-list.el2
3 files changed, 4 insertions, 4 deletions
diff --git a/lisp/ob-abc.el b/lisp/ob-abc.el
index cefbe71..43ee1d9 100644
--- a/lisp/ob-abc.el
+++ b/lisp/ob-abc.el
@@ -47,7 +47,7 @@
(value (cdr pair)))
(setq body
(replace-regexp-in-string
- (concat "\$" (regexp-quote name))
+ (concat "\\$" (regexp-quote name))
(if (stringp value) value (format "%S" value))
body))))
vars)
@@ -59,7 +59,7 @@
(message "executing Abc source code block")
(let* ((cmdline (cdr (assq :cmdline params)))
(out-file (let ((file (cdr (assq :file params))))
- (if file (replace-regexp-in-string "\.pdf$" ".ps" file)
+ (if file (replace-regexp-in-string "\\.pdf$" ".ps" file)
(error "abc code block requires :file header argument"))))
(in-file (org-babel-temp-file "abc-"))
(render (concat "abcm2ps" " " cmdline
diff --git a/lisp/ob-forth.el b/lisp/ob-forth.el
index 8eac454..2d61de3 100644
--- a/lisp/ob-forth.el
+++ b/lisp/ob-forth.el
@@ -53,7 +53,7 @@ This function is called by `org-babel-execute-src-block'"
(defun org-babel-forth-session-execute (body params)
(require 'forth-mode)
(let ((proc (forth-proc))
- (rx " \\(\n:\\|compiled\n\\\|ok\n\\)")
+ (rx " \\(\n:\\|compiled\n\\|ok\n\\)")
(result-start))
(with-current-buffer (process-buffer (forth-proc))
(mapcar (lambda (line)
diff --git a/lisp/org-list.el b/lisp/org-list.el
index cfd674f..272df52 100644
--- a/lisp/org-list.el
+++ b/lisp/org-list.el
@@ -221,7 +221,7 @@ into
(defcustom org-plain-list-ordered-item-terminator t
"The character that makes a line with leading number an ordered list item.
-Valid values are ?. and ?\). To get both terminators, use t.
+Valid values are ?. and ?\\). To get both terminators, use t.
This variable needs to be set before org.el is loaded. If you
need to make a change while Emacs is running, use the customize