Просмотр исходного кода

removing org-babel-temp-directory until some issues are resolved

Eric Schulte 14 лет назад
Родитель
Сommit
c19a04ec9f
1 измененных файлов с 30 добавлено и 29 удалено
  1. 30 29
      lisp/ob.el

+ 30 - 29
lisp/ob.el

@@ -1736,13 +1736,13 @@ the remote connection."
 	  localname))
     file))
 
-(defvar org-babel-temporary-directory
-  (or (and (boundp 'org-babel-temporary-directory)
-	   org-babel-temporary-directory)
-      (make-temp-file "babel-" t))
-  "Directory to hold temporary files created to execute code blocks.
-Used by `org-babel-temp-file'.  This directory will be removed on
-Emacs shutdown.")
+;; (defvar org-babel-temporary-directory
+;;   (or (and (boundp 'org-babel-temporary-directory)
+;; 	   org-babel-temporary-directory)
+;;       (make-temp-file "babel-" t))
+;;   "Directory to hold temporary files created to execute code blocks.
+;; Used by `org-babel-temp-file'.  This directory will be removed on
+;; Emacs shutdown.")
 
 (defun org-babel-temp-file (prefix &optional suffix)
   "Create a temporary file in the `org-babel-temporary-directory'.
@@ -1755,28 +1755,29 @@ of `org-babel-temporary-directory'."
 	       (expand-file-name 
 		prefix temporary-file-directory)
 	       nil suffix))
-    (let ((temporary-file-directory (expand-file-name
-				     org-babel-temporary-directory
-				     temporary-file-directory)))
-      (make-temp-file prefix nil suffix))))
-
-(defun org-babel-remove-temporary-directory ()
-  "Remove `org-babel-temporary-directory' on Emacs shutdown."
-  (when (boundp 'org-babel-temporary-directory)
-    ;; taken from `delete-directory' in files.el
-    (mapc (lambda (file)
-	    ;; This test is equivalent to
-	    ;; (and (file-directory-p fn) (not (file-symlink-p fn)))
-	    ;; but more efficient
-	    (if (eq t (car (file-attributes file)))
-		(delete-directory file)
-	      (delete-file file)))
-	  ;; We do not want to delete "." and "..".
-	  (directory-files org-babel-temporary-directory 'full
-			   "^\\([^.]\\|\\.\\([^.]\\|\\..\\)\\).*"))
-    (delete-directory org-babel-temporary-directory)))
-
-(add-hook 'kill-emacs-hook 'org-babel-remove-temporary-directory)
+    ;; (let ((temporary-file-directory (expand-file-name
+    ;; 				     org-babel-temporary-directory
+    ;; 				     temporary-file-directory)))
+    ;;   (make-temp-file prefix nil suffix))
+    (make-temp-file prefix nil suffix)))
+
+;; (defun org-babel-remove-temporary-directory ()
+;;   "Remove `org-babel-temporary-directory' on Emacs shutdown."
+;;   (when (boundp 'org-babel-temporary-directory)
+;;     ;; taken from `delete-directory' in files.el
+;;     (mapc (lambda (file)
+;; 	    ;; This test is equivalent to
+;; 	    ;; (and (file-directory-p fn) (not (file-symlink-p fn)))
+;; 	    ;; but more efficient
+;; 	    (if (eq t (car (file-attributes file)))
+;; 		(delete-directory file)
+;; 	      (delete-file file)))
+;; 	  ;; We do not want to delete "." and "..".
+;; 	  (directory-files org-babel-temporary-directory 'full
+;; 			   "^\\([^.]\\|\\.\\([^.]\\|\\..\\)\\).*"))
+;;     (delete-directory org-babel-temporary-directory)))
+
+;; (add-hook 'kill-emacs-hook 'org-babel-remove-temporary-directory)
 
 (provide 'ob)