From d7ef1bfbaef873521731697d86112029f02cdc8b Mon Sep 17 00:00:00 2001 From: Achim Gratz Date: Sat, 2 Jun 2012 18:38:24 +0200 Subject: [PATCH 5/5] Make byte-compiler more happy * contrib/lisp/org-e-ascii.el: Remove declarations and replace with require. * contrib/lisp/org-e-html.el: Remove declarations and replace with require. * contrib/lisp/org-e-latex.el: Remove declarations and replace with require. * contrib/lisp/org-e-publish.el: Remove declarations and replace with require. * contrib/lisp/org-export.el: Remove declarations and replace with require. Prevent byte-compilation, it currently would produce an error due to circular dependencies in the file. --- contrib/lisp/org-e-ascii.el | 38 ++++------------------------------ contrib/lisp/org-e-html.el | 41 +++++------------------------------- contrib/lisp/org-e-latex.el | 46 +++++------------------------------------ contrib/lisp/org-e-publish.el | 22 +++++--------------- contrib/lisp/org-export.el | 15 +++++++++----- 5 files changed, 29 insertions(+), 133 deletions(-) diff --git a/contrib/lisp/org-e-ascii.el b/contrib/lisp/org-e-ascii.el index c8bc334..4956b14 100644 --- a/contrib/lisp/org-e-ascii.el +++ b/contrib/lisp/org-e-ascii.el @@ -32,40 +32,10 @@ ;;; Code: -(eval-when-compile (require 'cl)) - -(declare-function org-element-contents "org-element" (element)) -(declare-function org-element-property "org-element" (property element)) -(declare-function org-element-normalize-string "org-element" (s)) -(declare-function org-element-map "org-element" - (data types fun &optional info first-match)) - -(declare-function org-export-collect-footnote-definitions - "org-export" (data info)) -(declare-function org-export-collect-headlines "org-export" (info &optional n)) -(declare-function org-export-collect-listings "org-export" (info)) -(declare-function org-export-collect-tables "org-export" (info)) -(declare-function org-export-data "org-export" (data info)) -(declare-function org-export-expand-macro "org-export" (macro info)) -(declare-function org-export-format-code-default "org-export" (element info)) -(declare-function org-export-get-coderef-format "org-export" (path desc)) -(declare-function org-export-get-footnote-number "org-export" (footnote info)) -(declare-function org-export-get-headline-number "org-export" (headline info)) -(declare-function org-export-get-ordinal "org-export" - (element info &optional types predicate)) -(declare-function org-export-get-parent-headline "org-export" (blob info)) -(declare-function org-export-get-relative-level "org-export" (headline info)) -(declare-function org-export-low-level-p "org-export" (headline info)) -(declare-function org-export-output-file-name "org-export" - (extension &optional subtreep pub-dir)) -(declare-function org-export-resolve-coderef "org-export" (ref info)) -(declare-function org-export-resolve-fuzzy-link "org-export" (link info)) -(declare-function org-export-resolve-id-link "org-export" (link info)) -(declare-function org-export-resolve-radio-link "org-export" (link info)) -(declare-function - org-export-to-file "org-export" - (backend file &optional subtreep visible-only body-only ext-plist)) - +(eval-when-compile + (require 'cl)) +(require 'org-element) +(require 'org-export) ;;; Define Back-End ;; diff --git a/contrib/lisp/org-e-html.el b/contrib/lisp/org-e-html.el index 53547a0..1f39b92 100644 --- a/contrib/lisp/org-e-html.el +++ b/contrib/lisp/org-e-html.el @@ -35,48 +35,17 @@ ;;; org-e-html.el ;;; Dependencies +(eval-when-compile + (require 'cl) + (require 'table)) +(require 'org-exp) (require 'org-export) +(require 'org-lparse) (require 'format-spec) -(eval-when-compile (require 'cl) (require 'table)) - ;;; Function Declarations -(declare-function org-element-get-property "org-element" (property element)) -(declare-function org-element-normalize-string "org-element" (s)) - -(declare-function org-export-data "org-export" (data info)) -(declare-function org-export-directory "org-export" (type plist)) -(declare-function org-export-expand-macro "org-export" (macro info)) -(declare-function org-export-first-sibling-p "org-export" (headline info)) -(declare-function org-export-footnote-first-reference-p "org-export" - (footnote-reference info)) -(declare-function org-export-get-coderef-format "org-export" (path desc)) -(declare-function org-export-get-footnote-definition "org-export" - (footnote-reference info)) -(declare-function org-export-get-footnote-number "org-export" (footnote info)) -(declare-function org-export-get-previous-element "org-export" (blob info)) -(declare-function org-export-get-relative-level "org-export" (headline info)) -(declare-function org-export-handle-code - "org-export" (element info &optional num-fmt ref-fmt delayed)) -(declare-function org-export-inline-image-p "org-export" - (link &optional extensions)) -(declare-function org-export-last-sibling-p "org-export" (headline info)) -(declare-function org-export-low-level-p "org-export" (headline info)) -(declare-function org-export-output-file-name - "org-export" (extension &optional subtreep pub-dir)) -(declare-function org-export-resolve-coderef "org-export" (ref info)) -(declare-function org-export-resolve-fuzzy-link "org-export" (link info)) -(declare-function org-export-resolve-radio-link "org-export" (link info)) -(declare-function org-export-solidify-link-text "org-export" (s)) -(declare-function - org-export-to-buffer "org-export" - (backend buffer &optional subtreep visible-only body-only ext-plist)) -(declare-function - org-export-to-file "org-export" - (backend file &optional subtreep visible-only body-only ext-plist)) - (declare-function org-id-find-id-file "org-id" (id)) (declare-function htmlize-region "ext:htmlize" (beg end)) (declare-function org-pop-to-buffer-same-window diff --git a/contrib/lisp/org-e-latex.el b/contrib/lisp/org-e-latex.el index 67e9197..0bcf310 100644 --- a/contrib/lisp/org-e-latex.el +++ b/contrib/lisp/org-e-latex.el @@ -35,47 +35,11 @@ ;;; Code: -(eval-when-compile (require 'cl)) - -(defvar org-export-latex-default-packages-alist) -(defvar org-export-latex-packages-alist) - -(declare-function org-element-property "org-element" (property element)) -(declare-function org-element-normalize-string "org-element" (s)) - -(declare-function org-export-data "org-export" (data info)) -(declare-function org-export-directory "org-export" (type plist)) -(declare-function org-export-expand-macro "org-export" (macro info)) -(declare-function org-export-first-sibling-p "org-export" (headline info)) -(declare-function org-export-footnote-first-reference-p "org-export" - (footnote-reference info)) -(declare-function org-export-format-code "org-export" - (code fun &optional num-lines ref-alist)) -(declare-function org-export-format-code-default "org-export" (element info)) -(declare-function org-export-get-coderef-format "org-export" (path desc)) -(declare-function org-export-get-footnote-definition "org-export" - (footnote-reference info)) -(declare-function org-export-get-footnote-number "org-export" (footnote info)) -(declare-function org-export-get-previous-element "org-export" (blob info)) -(declare-function org-export-get-relative-level "org-export" (headline info)) -(declare-function org-export-unravel-code "org-export" (element)) -(declare-function org-export-inline-image-p "org-export" - (link &optional extensions)) -(declare-function org-export-last-sibling-p "org-export" (headline info)) -(declare-function org-export-low-level-p "org-export" (headline info)) -(declare-function org-export-output-file-name - "org-export" (extension &optional subtreep pub-dir)) -(declare-function org-export-resolve-coderef "org-export" (ref info)) -(declare-function org-export-resolve-fuzzy-link "org-export" (link info)) -(declare-function org-export-resolve-radio-link "org-export" (link info)) -(declare-function org-export-solidify-link-text "org-export" (s)) -(declare-function - org-export-to-buffer "org-export" - (backend buffer &optional subtreep visible-only body-only ext-plist)) -(declare-function - org-export-to-file "org-export" - (backend file &optional subtreep visible-only body-only ext-plist)) - +(eval-when-compile + (require 'cl)) +(require 'org-export) +(require 'org-element) +(require 'org-table) ;;; Define Back-End diff --git a/contrib/lisp/org-e-publish.el b/contrib/lisp/org-e-publish.el index 1920abf..bc71ebf 100644 --- a/contrib/lisp/org-e-publish.el +++ b/contrib/lisp/org-e-publish.el @@ -38,25 +38,13 @@ ;;; Code: -(eval-when-compile (require 'cl)) +(eval-when-compile + (require 'cl)) +(require 'org-element) +(require 'org-export) +(require 'org-e-latex) (require 'format-spec) -(declare-function org-element-property "org-element" (property element)) -(declare-function org-element-map "org-element" - (data types fun &optional info first-match)) - -(declare-function org-export-output-file-name "org-export" - (extension &optional subtreep pub-dir)) -(declare-function - org-export-to-file "org-export" - (backend file &optional subtreep visible-only body-only ext-plist)) -(declare-function org-export-get-parent-headline "org-export" (blob info)) -(declare-function org-export-get-environment "org-export" - (&optional backend subtreep ext-plist)) -(declare-function org-export-get-inbuffer-options "org-export" - (&optional backend files)) - - ;;; Variables (defvar org-e-publish-initial-buffer nil diff --git a/contrib/lisp/org-export.el b/contrib/lisp/org-export.el index b9294e5..31c2729 100644 --- a/contrib/lisp/org-export.el +++ b/contrib/lisp/org-export.el @@ -100,7 +100,9 @@ ;;; Code: -(eval-when-compile (require 'cl)) +(eval-when-compile + (require 'cl) + (require 'org)) (require 'org-element) @@ -3937,7 +3939,6 @@ (defun org-export-get-next-element (blob info) (let ((parent (org-export-get-parent blob info))) (cadr (member blob (org-element-contents parent))))) - ;;; The Dispatcher ;; @@ -3998,7 +3999,6 @@ (defun org-export-dispatch () (?l (require 'org-e-latex) (org-e-latex-export-to-latex - (require 'org-e-latex) (memq 'subtree optns) (memq 'visible optns) (memq 'body optns))) (?p (require 'org-e-latex) @@ -4018,7 +4018,7 @@ (defun org-export-dispatch () (memq 'subtree optns) (memq 'visible optns) (memq 'body optns)))) ;; set major mode (with-current-buffer outbuf - (if (featurep 'nxhtml-mode) (nxhtml-mode) (nxml-mode))) + (if (featurep 'nxhtml-mode) (org-no-warnings (nxhtml-mode)) (nxml-mode))) (when org-export-show-temporary-export-buffer (switch-to-buffer-other-window outbuf)))) (?h @@ -4151,6 +4151,11 @@ (defun org-export-dispatch-ui (options expertp) (get-buffer-window "*Org Export/Publishing Help*")) (funcall handle-keypress standard-prompt))))) - + (provide 'org-export) +;; Local Variables: +;; version-control: never +;; no-byte-compile: t +;; coding: utf-8 +;; End: ;;; org-export.el ends here -- 1.7.9.2