aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEric Schulte2014-05-11 23:09:43 -0700
committerGlenn Morris2014-05-11 23:09:43 -0700
commit45d2587daf5fa76b7a2d077dba56b82e8e2b2ab3 (patch)
treed8e3408ee864f59219be8b7fce14a6454c4b125d
parent97100b43793e0e123068bd31691659886a066f39 (diff)
downloademacs-45d2587daf5fa76b7a2d077dba56b82e8e2b2ab3.tar.gz
emacs-45d2587daf5fa76b7a2d077dba56b82e8e2b2ab3.zip
ob-screen tempfile fixes
* lisp/org/ob-screen.el (org-babel-screen-session-write-temp-file) (org-babel-screen-test): Use unpredictable names for temporary files. Fixes: debbugs:17416
-rw-r--r--lisp/org/ChangeLog6
-rw-r--r--lisp/org/ob-screen.el4
2 files changed, 8 insertions, 2 deletions
diff --git a/lisp/org/ChangeLog b/lisp/org/ChangeLog
index 8a9fc20b4ff..a74388b7d71 100644
--- a/lisp/org/ChangeLog
+++ b/lisp/org/ChangeLog
@@ -1,3 +1,9 @@
12014-05-12 Eric Schulte <eric.schulte@gmx.com>
2
3 * ob-screen.el (org-babel-screen-session-write-temp-file)
4 (org-babel-screen-test):
5 Use unpredictable names for temporary files. (Bug#17416)
6
12014-04-22 Aaron Ecay <aaronecay@gmail.com> 72014-04-22 Aaron Ecay <aaronecay@gmail.com>
2 8
3 * org-src.el (org-edit-src-exit): Place an undo boundary before 9 * org-src.el (org-edit-src-exit): Place an undo boundary before
diff --git a/lisp/org/ob-screen.el b/lisp/org/ob-screen.el
index 2acbbeb7182..1d4ccdddf85 100644
--- a/lisp/org/ob-screen.el
+++ b/lisp/org/ob-screen.el
@@ -106,7 +106,7 @@ In case you want to use a different screen than one selected by your $PATH")
106 106
107(defun org-babel-screen-session-write-temp-file (session body) 107(defun org-babel-screen-session-write-temp-file (session body)
108 "Save BODY in a temp file that is named after SESSION." 108 "Save BODY in a temp file that is named after SESSION."
109 (let ((tmpfile (concat "/tmp/screen.org-babel-session-" session))) 109 (let ((tmpfile (org-babel-temp-file "screen-")))
110 (with-temp-file tmpfile 110 (with-temp-file tmpfile
111 (insert body) 111 (insert body)
112 112
@@ -121,7 +121,7 @@ The terminal should shortly flicker."
121 (interactive) 121 (interactive)
122 (let* ((session "org-babel-testing") 122 (let* ((session "org-babel-testing")
123 (random-string (format "%s" (random 99999))) 123 (random-string (format "%s" (random 99999)))
124 (tmpfile "/tmp/org-babel-screen.test") 124 (tmpfile (org-babel-temp-file "ob-screen-test-"))
125 (body (concat "echo '" random-string "' > " tmpfile "\nexit\n")) 125 (body (concat "echo '" random-string "' > " tmpfile "\nexit\n"))
126 process tmp-string) 126 process tmp-string)
127 (org-babel-execute:screen body org-babel-default-header-args:screen) 127 (org-babel-execute:screen body org-babel-default-header-args:screen)