From 574695895403790f8c445d057139117a3d3069fa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mattias=20Engdeg=C3=A5rd?= Date: Sat, 16 Mar 2019 11:36:38 -0700 Subject: [PATCH] Backport commit 8832cc5f9 from Emacs MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * 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 --- lisp/ob-abc.el | 4 ++-- lisp/ob-forth.el | 2 +- lisp/org-list.el | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/lisp/ob-abc.el b/lisp/ob-abc.el index cefbe716e..43ee1d992 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 8eac45426..2d61de31c 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 cfd674f85..272df52f7 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