* 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.

13 files changed, 71 insertions, 27 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 886e8b62f8..d932d49ed9 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,37 @@
+2007-10-21  Dan Nicolaescu  <[email protected]>
+
+	* 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.
+
 2007-10-20  Juri Linkov  <[email protected]>
 
 	* textmodes/fill.el (fill-paragraph): When the region is active,
diff --git a/lisp/calendar/cal-hebrew.el b/lisp/calendar/cal-hebrew.el
index 02cc9bfabb..5bc61dcbcc 100644
--- a/lisp/calendar/cal-hebrew.el
+++ b/lisp/calendar/cal-hebrew.el
@@ -45,6 +45,9 @@
 (defvar original-date)
 
 (require 'calendar)
+(eval-when-compile 
+  (require 'diary-lib)
+  (require 'holidays))
 
 (defun hebrew-calendar-leap-year-p (year)
   "t if YEAR is a Hebrew calendar leap year."
diff --git a/lisp/calendar/cal-islam.el b/lisp/calendar/cal-islam.el
index c562437fc1..da1ed6fc14 100644
--- a/lisp/calendar/cal-islam.el
+++ b/lisp/calendar/cal-islam.el
@@ -43,6 +43,7 @@
 (defvar original-date)
 
 (require 'cal-julian)
+(eval-when-compile (require 'diary-lib))
 
 (defvar calendar-islamic-month-name-array
   ["Muharram" "Safar" "Rabi I" "Rabi II" "Jumada I" "Jumada II"
diff --git a/lisp/calendar/todo-mode.el b/lisp/calendar/todo-mode.el
index 13ef042f73..5a0a0a4504 100644
--- a/lisp/calendar/todo-mode.el
+++ b/lisp/calendar/todo-mode.el
@@ -914,7 +914,8 @@ Number of entries for each category is given by `todo-print-priorities'."
 
 (eval-when-compile
   (defvar date)
-  (defvar entry))
+  (defvar entry)
+  (require 'calendar))
 
 ;; Read about this function in the setup instructions above!
 ;;;###autoload
diff --git a/lisp/loadup.el b/lisp/loadup.el
index d015f6a1c6..3bf021b017 100644
--- a/lisp/loadup.el
+++ b/lisp/loadup.el
@@ -194,11 +194,11 @@
     (progn
       (load "international/ccl")
       (load "international/code-pages")
+      (load "w32-vars")
       (load "term/w32-win")
       (load "ls-lisp")
       (load "disp-table") ; needed to setup ibm-pc char set, see internal.el
       (load "dos-w32")
-      (load "w32-vars")
       (load "w32-fns")))
 (if (eq system-type 'ms-dos)
     (progn
diff --git a/lisp/net/rcirc.el b/lisp/net/rcirc.el
index 14fda445e4..b2ad08d7cc 100644
--- a/lisp/net/rcirc.el
+++ b/lisp/net/rcirc.el
@@ -1281,6 +1281,20 @@ Logfiles are kept in `rcirc-log-directory'."
   :type 'boolean
   :group 'rcirc)
 
+(defvar rcirc-markup-text-functions
+  '(rcirc-markup-attributes
+    rcirc-markup-my-nick
+    rcirc-markup-urls
+    rcirc-markup-keywords
+    rcirc-markup-bright-nicks
+    rcirc-markup-fill)
+
+  "List of functions used to manipulate text before it is printed.
+
+Each function takes two arguments, SENDER, RESPONSE.  The buffer
+is narrowed with the text to be printed and the point is at the
+beginning of the `rcirc-text' propertized text.")
+
 (defun rcirc-print (process sender response target text &optional activity)
   "Print TEXT in the buffer associated with TARGET.
 Format based on SENDER and RESPONSE.  If ACTIVITY is non-nil,
@@ -2083,20 +2097,6 @@ keywords when no KEYWORD is given."
       (rcirc-browse-url-at-point (posn-point position)))))
 
 
-(defvar rcirc-markup-text-functions
-  '(rcirc-markup-attributes
-    rcirc-markup-my-nick
-    rcirc-markup-urls
-    rcirc-markup-keywords
-    rcirc-markup-bright-nicks
-    rcirc-markup-fill)
-
-  "List of functions used to manipulate text before it is printed.
-
-Each function takes two arguments, SENDER, RESPONSE.  The buffer
-is narrowed with the text to be printed and the point is at the
-beginning of the `rcirc-text' propertized text.")
-
 (defun rcirc-markup-timestamp (sender response)
   (goto-char (point-min))
   (insert (rcirc-facify (format-time-string rcirc-time-format)
diff --git a/lisp/play/blackbox.el b/lisp/play/blackbox.el
index f21a445866..699aa91abc 100644
--- a/lisp/play/blackbox.el
+++ b/lisp/play/blackbox.el
@@ -296,14 +296,14 @@ a reflection."
 (defun bb-up (count)
   (interactive "p")
   (while (and (> count 0) (> bb-y -1))
-    (previous-line 1)
+    (forward-line -1)
     (setq bb-y (1- bb-y))
     (setq count (1- count))))
 
 (defun bb-down (count)
   (interactive "p")
   (while (and (> count 0) (< bb-y 8))
-    (next-line 1)
+    (forward-line 1)
     (setq bb-y (1+ bb-y))
     (setq count (1- count))))
 
diff --git a/lisp/term/pc-win.el b/lisp/term/pc-win.el
index ca85e824ca..ecbda7d9c1 100644
--- a/lisp/term/pc-win.el
+++ b/lisp/term/pc-win.el
@@ -130,7 +130,7 @@
       (unless success (delete-frame frame)))
     frame))
 
-(setq frame-creation-function 'make-msdos-frame)
+(add-to-list 'frame-creation-function-alist '(pc . make-msdos-frame))
 
 ;; ---------------------------------------------------------------------------
 ;; More or less useful imitations of certain X-functions.  A lot of the
diff --git a/lisp/term/tty-colors.el b/lisp/term/tty-colors.el
index 18b07fafc3..70323e3155 100644
--- a/lisp/term/tty-colors.el
+++ b/lisp/term/tty-colors.el
@@ -63,6 +63,7 @@
 ;;; Code:
 
 (defvar msdos-color-values)
+(defvar w32-tty-standard-colors)
 
 ;; The following list is taken from rgb.txt distributed with X.
 ;;
diff --git a/lisp/term/w32-win.el b/lisp/term/w32-win.el
index 51a25482be..6a2ea13be3 100644
--- a/lisp/term/w32-win.el
+++ b/lisp/term/w32-win.el
@@ -79,12 +79,14 @@
 (require 'menu-bar)
 (require 'dnd)
 (require 'code-pages)
+(require 'w32-vars)
 
 ;; Keep an obsolete alias for w32-focus-frame in case it is used by code
 ;; outside Emacs.
 (define-obsolete-function-alias 'w32-focus-frame 'x-focus-frame "23.1")
 
 (defvar xlfd-regexp-registry-subnum)
+(defvar w32-color-map) ;; defined in w32fns.c
 
 ;; Conditional on new-fontset so bootstrapping works on non-GUI compiles
 (if (fboundp 'new-fontset)
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 ------------------------------
diff --git a/lisp/w32-vars.el b/lisp/w32-vars.el
index 5eaac3ac3c..d907f6bcf4 100644
--- a/lisp/w32-vars.el
+++ b/lisp/w32-vars.el
@@ -155,6 +155,7 @@ This is in addition to the primary selection."
   :type 'boolean
   :group 'killing)
 
+(provide 'w32-vars)
 
 ;;; arch-tag: ee2394fb-9db7-4c15-a8f0-66b47f4a2bb1
 ;;; w32-vars.el ends here