From 729f1525da7a8816e655daa51f6f4b2e7d7a043b Mon Sep 17 00:00:00 2001
From: Dan Nicolaescu <dann@ics.uci.edu>
Date: Sun, 21 Oct 2007 00:24:32 +0000
Subject: * textmodes/reftex.el: Move require easymenu before first use.
 (reftex-info): Require info at compile too.

* textmodes/org-publish.el (org-publish-org-to-html)
(org-publish-org-to): Require org at compile time too.
(org-publish-attachment): Require at compile time too.

* term/tty-colors.el (w32-tty-standard-colors): Pacify
byte-compiler.

* term/pc-win.el (frame-creation-function-alist): Add to this
instead of setting frame-creation-function.

* play/blackbox.el (bb-up, bb-down): Use forward-line.

* net/rcirc.el (rcirc-markup-text-functions): Move definition
earlier.

* calendar/todo-mode.el: Require calendar at compile time.

* calendar/cal-islam.el: Require diary-lib at compile time.

* calendar/cal-hebrew.el: Require diary-lib and holidays at
compile time.

* w32-vars.el: Provide w32-vars.

* term/w32-win.el: Require w32-vars.
(w32-color-map): Pacify byte-compiler.

* loadup.el: Load w32-wars before term/w32-win.
---
 lisp/textmodes/org-publish.el | 11 ++++++-----
 lisp/textmodes/reftex.el      |  6 +++---
 2 files changed, 9 insertions(+), 8 deletions(-)

(limited to 'lisp/textmodes')

diff --git a/lisp/textmodes/org-publish.el b/lisp/textmodes/org-publish.el
index bc45a7d994..77b69a1f5a 100644
--- a/lisp/textmodes/org-publish.el
+++ b/lisp/textmodes/org-publish.el
@@ -443,7 +443,7 @@ nil if not found."
   "Publish an org file to HTML.
 PLIST is the property list for the given project.
 FILENAME is the filename of the org file to be published."
-  (require 'org)
+  (eval-and-compile (require 'org))
   (let* ((arg (plist-get plist :headline-levels)))
     (progn
       (find-file filename)
@@ -464,7 +464,7 @@ FILENAME is the filename of the org file to be published."
   "Publish an org file to FORMAT.
 PLIST is the property list for the given project.
 FILENAME is the filename of the org file to be published."
-  (require 'org)
+  (eval-and-compile (require 'org))
   (let* ((arg (plist-get plist :headline-levels)))
     (progn
       (find-file filename)
@@ -478,9 +478,10 @@ FILENAME is the filename of the org file to be published."
 PLIST is the property list for the given project.
 FILENAME is the filename of the file to be published."
   ;; make sure eshell/cp code is loaded
-  (require 'eshell)
-  (require 'esh-maint)
-  (require 'em-unix)
+  (eval-and-compile
+    (require 'eshell)
+    (require 'esh-maint)
+    (require 'em-unix))
   (let ((destination (file-name-as-directory (plist-get plist :publishing-directory))))
     (eshell/cp filename destination)))
 
diff --git a/lisp/textmodes/reftex.el b/lisp/textmodes/reftex.el
index 519faded54..0c1beb1776 100644
--- a/lisp/textmodes/reftex.el
+++ b/lisp/textmodes/reftex.el
@@ -281,6 +281,8 @@
 ;; Stuff that needs to be there when we use defcustom
 (require 'custom)
 
+(require 'easymenu)
+
 (defvar reftex-tables-dirty t
   "Flag showing if tables need to be re-computed.")
 
@@ -2425,8 +2427,6 @@ IGNORE-WORDS List of words which should be removed from the string."
 (defvar reftex-isearch-minor-mode nil)
 (make-variable-buffer-local 'reftex-isearch-minor-mode)
 
-(require 'easymenu)
-
 (easy-menu-define reftex-mode-menu reftex-mode-map
  "Menu used in RefTeX mode"
  `("Ref"
@@ -2583,7 +2583,7 @@ IGNORE-WORDS List of words which should be removed from the string."
   "Read documentation for RefTeX in the info system.
 With optional NODE, go directly to that node."
   (interactive)
-  (require 'info)
+  (eval-and-compile (require 'info))
   (Info-goto-node (format "(reftex)%s" (or node ""))))
 
 ;;; Install the kill-buffer and kill-emacs hooks ------------------------------
-- 
cgit v1.2.3