summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAchim Gratz <Stromeko@Stromeko.DE>2014-09-19 11:53:46 +0200
committerAchim Gratz <Stromeko@Stromeko.DE>2014-09-19 11:53:46 +0200
commitc478b57d4e2b18982d33043e43d470cfc0fe9d53 (patch)
tree543ab302326dc31deee5d8534d5da398b09b5977
parent7d8523d9d143baf63d0791d5a83f294b028caf62 (diff)
parent98afe0046f5fa383b65ffd5ae6847ace68142dc8 (diff)
downloadorg-mode-c478b57d4e2b18982d33043e43d470cfc0fe9d53.tar.gz
Merge branch 'maint'
-rw-r--r--lisp/ob-shell.el8
1 files changed, 4 insertions, 4 deletions
diff --git a/lisp/ob-shell.el b/lisp/ob-shell.el
index 817762f..aa14a69 100644
--- a/lisp/ob-shell.el
+++ b/lisp/ob-shell.el
@@ -177,10 +177,10 @@ Emacs-lisp table, otherwise return the results as a string."
(or (org-babel-comint-buffer-livep session)
(progn
(shell session)
- ; Needed for Emacs 23 since the marker is initially
- ; undefined and the filter functions try to use it without
- ; checking.
- (set-mark comint-last-output-start (point))
+ ;; Needed for Emacs 23 since the marker is initially
+ ;; undefined and the filter functions try to use it without
+ ;; checking.
+ (set-marker comint-last-output-start (point))
(get-buffer (current-buffer)))))))
(defvar org-babel-sh-eoe-indicator "echo 'org_babel_sh_eoe'"