From 15b7347953c77b2f6b4e6288b772758521b27bc3 Mon Sep 17 00:00:00 2001
From: Carsten Dominik <carsten.dominik@gmail.com>
Date: Sun, 4 Apr 2010 22:26:27 +0200
Subject: [PATCH] Keep byte compiler happy

---
 lisp/org-ascii.el    | 2 +-
 lisp/org-docbook.el  | 2 +-
 lisp/org-entities.el | 4 +++-
 lisp/org.el          | 1 +
 4 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/lisp/org-ascii.el b/lisp/org-ascii.el
index 5335b6a92..11024e524 100644
--- a/lisp/org-ascii.el
+++ b/lisp/org-ascii.el
@@ -581,7 +581,7 @@ publishing directory."
   (let (e)
     (while (re-search-forward "\\\\\\([a-zA-Z]+[0-9]*\\)" nil t)
       (org-if-unprotected-at (match-beginning 1)
-	(setq e (org-entity-get-representation (match-string 1 line)
+	(setq e (org-entity-get-representation (match-string 1)
 					       org-export-ascii-entities))
 	(and e (replace-match e t t))))))
 
diff --git a/lisp/org-docbook.el b/lisp/org-docbook.el
index 9d897258a..60b7fda0c 100644
--- a/lisp/org-docbook.el
+++ b/lisp/org-docbook.el
@@ -1354,7 +1354,7 @@ This function adds a label to the table if it is available, and
 also changes TABLE to informaltable if caption does not exist.
 TABLE is a string containing the HTML code generated by
 `org-format-table-html' for a table in Org-mode buffer."
-  (let ((table-with-label label))
+  (let (table-with-label)
     ;; Get the label if it exists, and move it into the <table> element.
     (setq table-with-label
 	  (if (string-match
diff --git a/lisp/org-entities.el b/lisp/org-entities.el
index 5a12bda36..2a8fc4a51 100644
--- a/lisp/org-entities.el
+++ b/lisp/org-entities.el
@@ -26,6 +26,8 @@
 ;;
 ;;; Commentary:
 
+(declare-function org-table-align "org-table" ())
+
 (eval-when-compile
   (require 'cl))
 
@@ -447,7 +449,7 @@ Kind can be any of `latex', `html', `ascii', `latin1', or `utf8'."
   (interactive)
   (let ((ll org-entities)
 	(pos (point))
-	e latex mathp html latin utf8)
+	e latex mathp html latin utf8 name ascii)
     (insert "|Name|LaTeX code|LaTeX|HTML code |HTML|ASCII|Latin1|UTF-8\n|-\n")
     (while ll
       (setq e (pop ll))
diff --git a/lisp/org.el b/lisp/org.el
index dbe0f6a55..48ec349bc 100644
--- a/lisp/org.el
+++ b/lisp/org.el
@@ -15266,6 +15266,7 @@ Some of the options can be changed using the variable
 	       org-export-latex-packages-alist
 	       org-format-latex-header-extra))
       (insert "\n\\begin{document}\n" string "\n\\end{document}\n")
+      (require 'org-latex)
       (org-export-latex-fix-inputenc))
     (let ((dir default-directory))
       (condition-case nil