summaryrefslogtreecommitdiff
path: root/lisp/ob-sh.el
diff options
context:
space:
mode:
authorSébastien Delafond <sdelafond@gmail.com>2014-10-13 11:01:35 +0200
committerSébastien Delafond <sdelafond@gmail.com>2014-10-13 11:06:55 +0200
commitf70daf3c8aee0cc0cc16a65621cc66063ffee192 (patch)
treee9e391767f0cc706575fab56ed3e376e5389c5a2 /lisp/ob-sh.el
parent4ce8456531b4918b61116ce41752d95b50f2c5e8 (diff)
Imported Upstream version 8.2.10
Diffstat (limited to 'lisp/ob-sh.el')
-rw-r--r--lisp/ob-sh.el8
1 files changed, 7 insertions, 1 deletions
diff --git a/lisp/ob-sh.el b/lisp/ob-sh.el
index 96f275b..856c7a0 100644
--- a/lisp/ob-sh.el
+++ b/lisp/ob-sh.el
@@ -123,7 +123,13 @@ Emacs-lisp table, otherwise return the results as a string."
(when (and session (not (string= session "none")))
(save-window-excursion
(or (org-babel-comint-buffer-livep session)
- (progn (shell session) (get-buffer (current-buffer)))))))
+ (progn
+ (shell session)
+ ;; 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'"
"String to indicate that evaluation has completed.")