From 707897c25c8f2412a31d5f47bc2c201c5bcf8d1d Mon Sep 17 00:00:00 2001
From: Nick Dokos <nick@dokosmarshall.org>
Date: Fri, 19 Aug 2011 05:02:57 -0400
Subject: [PATCH] Eliminate extra newline(s) after example or src block.

Signed-off-by: Nick Dokos <nick@dokosmarshall.org>
---
 lisp/ob-exp.el    | 2 +-
 lisp/org-exp.el   | 2 +-
 lisp/org-latex.el | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/lisp/ob-exp.el b/lisp/ob-exp.el
index 9da0487cc..d1b13c847 100644
--- a/lisp/ob-exp.el
+++ b/lisp/ob-exp.el
@@ -231,7 +231,7 @@ The function respects the value of the :exports header argument."
 (defun org-babel-exp-code (info)
   "Return the original code block formatted for export."
   (org-fill-template
-   "#+BEGIN_SRC %lang%flags\n%body\n#+END_SRC\n"
+   "#+BEGIN_SRC %lang%flags\n%body\n#+END_SRC"
    `(("lang"  . ,(nth 0 info))
      ("flags" . ,((lambda (f) (when f (concat " " f))) (nth 3 info)))
      ("body"  . ,(nth 1 info)))))
diff --git a/lisp/org-exp.el b/lisp/org-exp.el
index 740f1952e..a2a2fb385 100644
--- a/lisp/org-exp.el
+++ b/lisp/org-exp.el
@@ -2718,7 +2718,7 @@ INDENT was the original indentation of the block."
 	     "\n#+BEGIN_" backend-name "\n"
 	     (org-add-props rtn
 		 '(org-protected t org-example t org-native-text t))
-	     "\n#+END_" backend-name "\n\n"))
+	     "\n#+END_" backend-name "\n"))
       (org-add-props rtn nil 'original-indentation indent))))
 
 (defun org-export-number-lines (text &optional skip1 skip2 number cont
diff --git a/lisp/org-latex.el b/lisp/org-latex.el
index f46f9f5d6..17626b53b 100644
--- a/lisp/org-latex.el
+++ b/lisp/org-latex.el
@@ -401,7 +401,7 @@ will pass them (combined with the LaTeX default list parameters) to
   :type 'plist)
 
 (defcustom org-export-latex-verbatim-wrap
-  '("\\begin{verbatim}\n" . "\\end{verbatim}\n")
+  '("\\begin{verbatim}\n" . "\\end{verbatim}")
   "Environment to be wrapped around a fixed-width section in LaTeX export.
 This is a cons with two strings, to be added before and after the
 fixed-with text.