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

Merge branch 'master' into next

This commit is contained in:
Nicolas Goaziou 2018-10-06 09:42:04 +02:00
parent 26ed66b233 5cc69a9ebf
commit 1b62a56498
5 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lisp/ob-core.el
View File

@ -3135,10 +3135,6 @@ Callers of this function will probably want to add an entry to
(when (and sym (boundp sym)) (when (and sym (boundp sym))
(defvaralias (intern (concat "org-babel-" var ":" new)) sym))))) (defvaralias (intern (concat "org-babel-" var ":" new)) sym)))))
(defun org-babel-strip-quotes (string)
"Strip \\\"s from around a string, if applicable."
(org-unbracket-string "\"" "\"" string))
(provide 'ob-core) (provide 'ob-core)
;; Local variables: ;; Local variables:

9
lisp/ob-haskell.el
View File

@ -74,17 +74,16 @@
(org-babel-variable-assignments:haskell params))) (org-babel-variable-assignments:haskell params)))
(session (org-babel-haskell-initiate-session session params)) (session (org-babel-haskell-initiate-session session params))
(comint-preoutput-filter-functions (comint-preoutput-filter-functions
(cons 'ansi-color-filter-apply comint-preoutput-filter-functions)) (cons 'ansi-color-filter-apply comint-preoutput-filter-functions))
(raw (org-babel-comint-with-output (raw (org-babel-comint-with-output
(session org-babel-haskell-eoe t full-body) (session org-babel-haskell-eoe t full-body)
(insert (org-trim full-body)) (insert (org-trim full-body))
(comint-send-input nil t) (comint-send-input nil t)
(insert org-babel-haskell-eoe) (insert org-babel-haskell-eoe)
(comint-send-input nil t))) (comint-send-input nil t)))
(results (mapcar (results (mapcar #'org-strip-quotes
#'org-babel-strip-quotes (cdr (member org-babel-haskell-eoe
(cdr (member org-babel-haskell-eoe (reverse (mapcar #'org-trim raw)))))))
(reverse (mapcar #'org-trim raw)))))))
(org-babel-reassemble-table (org-babel-reassemble-table
(let ((result (let ((result
(pcase result-type (pcase result-type

10
lisp/ob-octave.el
View File

@ -237,13 +237,11 @@ value of the last statement in BODY, as elisp."
(`output (`output
(setq results (setq results
(if matlabp (if matlabp
(cdr (reverse (delq "" (mapcar (cdr (reverse (delq "" (mapcar #'org-strip-quotes
#'org-babel-strip-quotes (mapcar #'org-trim raw)))))
(mapcar #'org-trim raw)))))
(cdr (member org-babel-octave-eoe-output (cdr (member org-babel-octave-eoe-output
(reverse (mapcar (reverse (mapcar #'org-strip-quotes
#'org-babel-strip-quotes (mapcar #'org-trim raw)))))))
(mapcar #'org-trim raw)))))))
(mapconcat #'identity (reverse results) "\n"))))) (mapconcat #'identity (reverse results) "\n")))))
(defun org-babel-octave-import-elisp-from-file (file-name) (defun org-babel-octave-import-elisp-from-file (file-name)

3
lisp/org-compat.el
View File

@ -464,6 +464,9 @@ use of this function is for the stuck project list."
(debug (body))) (debug (body)))
`(with-silent-modifications ,@body)) `(with-silent-modifications ,@body))
(define-obsolete-function-alias 'org-babel-strip-quotes
'org-strip-quotes "Org 9.2")
;;;; Obsolete link types ;;;; Obsolete link types
(eval-after-load 'org (eval-after-load 'org

4
lisp/org-macs.el
View File

@ -882,6 +882,10 @@ removed."
(substring string (length pre) (- (length post))) (substring string (length pre) (- (length post)))
string)) string))
(defun org-strip-quotes (string)
"Strip double quotes from around a string, if applicable."
(org-unbracket-string "\"" "\"" string))
(defsubst org-current-line-string (&optional to-here) (defsubst org-current-line-string (&optional to-here)
(buffer-substring (point-at-bol) (if to-here (point) (point-at-eol)))) (buffer-substring (point-at-bol) (if to-here (point) (point-at-eol))))