浏览代码

Keep byte compiler happy

Carsten Dominik 15 年之前
父节点
当前提交
15b7347953
共有 4 个文件被更改,包括 6 次插入3 次删除
  1. 1 1
      lisp/org-ascii.el
  2. 1 1
      lisp/org-docbook.el
  3. 3 1
      lisp/org-entities.el
  4. 1 0
      lisp/org.el

+ 1 - 1
lisp/org-ascii.el

@@ -581,7 +581,7 @@ publishing directory."
   (let (e)
   (let (e)
     (while (re-search-forward "\\\\\\([a-zA-Z]+[0-9]*\\)" nil t)
     (while (re-search-forward "\\\\\\([a-zA-Z]+[0-9]*\\)" nil t)
       (org-if-unprotected-at (match-beginning 1)
       (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))
 					       org-export-ascii-entities))
 	(and e (replace-match e t t))))))
 	(and e (replace-match e t t))))))
 
 

+ 1 - 1
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.
 also changes TABLE to informaltable if caption does not exist.
 TABLE is a string containing the HTML code generated by
 TABLE is a string containing the HTML code generated by
 `org-format-table-html' for a table in Org-mode buffer."
 `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.
     ;; Get the label if it exists, and move it into the <table> element.
     (setq table-with-label
     (setq table-with-label
 	  (if (string-match
 	  (if (string-match

+ 3 - 1
lisp/org-entities.el

@@ -26,6 +26,8 @@
 ;;
 ;;
 ;;; Commentary:
 ;;; Commentary:
 
 
+(declare-function org-table-align "org-table" ())
+
 (eval-when-compile
 (eval-when-compile
   (require 'cl))
   (require 'cl))
 
 
@@ -447,7 +449,7 @@ Kind can be any of `latex', `html', `ascii', `latin1', or `utf8'."
   (interactive)
   (interactive)
   (let ((ll org-entities)
   (let ((ll org-entities)
 	(pos (point))
 	(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")
     (insert "|Name|LaTeX code|LaTeX|HTML code |HTML|ASCII|Latin1|UTF-8\n|-\n")
     (while ll
     (while ll
       (setq e (pop ll))
       (setq e (pop ll))

+ 1 - 0
lisp/org.el

@@ -15266,6 +15266,7 @@ Some of the options can be changed using the variable
 	       org-export-latex-packages-alist
 	       org-export-latex-packages-alist
 	       org-format-latex-header-extra))
 	       org-format-latex-header-extra))
       (insert "\n\\begin{document}\n" string "\n\\end{document}\n")
       (insert "\n\\begin{document}\n" string "\n\\end{document}\n")
+      (require 'org-latex)
       (org-export-latex-fix-inputenc))
       (org-export-latex-fix-inputenc))
     (let ((dir default-directory))
     (let ((dir default-directory))
       (condition-case nil
       (condition-case nil