Merge from emacs-24 branch

[gnu-emacs] / lisp / org / ob-screen.el

diff --git a/lisp/org/ob-screen.el b/lisp/org/ob-screen.el
index 59e23c4caade48a7a2bff0cf4a8466fa2e49f65d..37cdb28690ae01d245d0c74c52ebd582f3441a02 100644 (file)
--- a/lisp/org/ob-screen.el
+++ b/lisp/org/ob-screen.el
@@ -1,11 +1,10 @@
 ;;; ob-screen.el --- org-babel support for interactive terminal
 
-;; Copyright (C) 2009-2011  Free Software Foundation
+;; Copyright (C) 2009-2012  Free Software Foundation, Inc.
 
 ;; Author: Benjamin Andresen
 ;; Keywords: literate programming, interactive shell
 ;; Homepage: http://orgmode.org
-;; Version: 7.4
 
 ;; This file is part of GNU Emacs.
 
@@ -38,7 +37,7 @@
 (require 'ob-ref)
 
 (defvar org-babel-screen-location "screen"
-  "The command location for screen. 
+  "The command location for screen.
 In case you want to use a different screen than one selected by your $PATH")
 
 (defvar org-babel-default-header-args:screen
@@ -112,7 +111,7 @@ In case you want to use a different screen than one selected by your $PATH")
     (with-temp-file tmpfile
       (insert body)
 
-      ;; org-babel has superflous spaces
+      ;; org-babel has superfluous spaces
       (goto-char (point-min))
       (delete-matching-lines "^ +$"))
     tmpfile))
@@ -143,4 +142,5 @@ The terminal should shortly flicker."
 (provide 'ob-screen)
 
 
+
 ;;; ob-screen.el ends here