* progmodes/gud.el (gud-target-name): Move definition before use.

* progmodes/dcl-mode.el: Require imenu at compile time.

* progmodes/cc-engine.el (c-maybe-stale-found-type): Pacify
byte-compiler.

* obsolete/fast-lock.el: Use featurep test instead of
string-match.

* eshell/esh-mode.el (eshell-handle-ansi-color): Require
ansi-color at compile time too.

* eshell/em-unix.el (eshell/info): Require info at compile time
too.

* w32-fns.el: Require w32-vars.

* diff-mode.el (diff-refine-hunk): Require smerge-mode at compile
time too.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index b48191971727feddbcc4878caa1c2ca1110ddb9c..4573cb384996f3e8ed167871b6a8292c9472f4d0 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,26 @@
+2007-10-21  Dan Nicolaescu  <dann@ics.uci.edu>
+
+       * progmodes/gud.el (gud-target-name): Move definition before use.
+
+       * progmodes/dcl-mode.el: Require imenu at compile time.
+
+       * progmodes/cc-engine.el (c-maybe-stale-found-type): Pacify
+       byte-compiler.
+
+       * obsolete/fast-lock.el: Use featurep test instead of
+       string-match.
+
+       * eshell/esh-mode.el (eshell-handle-ansi-color): Require
+       ansi-color at compile time too.
+
+       * eshell/em-unix.el (eshell/info): Require info at compile time
+       too.
+
+       * w32-fns.el: Require w32-vars.
+
+       * diff-mode.el (diff-refine-hunk): Require smerge-mode at compile
+       time too.
+
 2007-10-21  Stefan Monnier  <monnier@iro.umontreal.ca>
 
        * double.el ([ignore]): Use ignore.

diff --git a/lisp/diff-mode.el b/lisp/diff-mode.el
index 34b116d92c825980a4d47d5f9de242dff9b294e3..9e9eb81797abe8c08f656a861609d87c0ab9306c 100644 (file)
--- a/lisp/diff-mode.el
+++ b/lisp/diff-mode.el
@@ -1686,7 +1686,7 @@ For use in `add-log-current-defun-function'."
 (defun diff-refine-hunk ()
   "Highlight changes of hunk at point at a finer granularity."
   (interactive)
-  (require 'smerge-mode)
+  (eval-and-compile (require 'smerge-mode))
   (save-excursion
     (diff-beginning-of-hunk 'try-harder)
     (let* ((style (diff-hunk-style))    ;Skips the hunk header as well.

diff --git a/lisp/eshell/em-unix.el b/lisp/eshell/em-unix.el
index aaad664918fcf891d71817868ec7d4eb063696e8..850d51dcac53df0c64d3dd34033741367b80c9a0 100644 (file)
--- a/lisp/eshell/em-unix.el
+++ b/lisp/eshell/em-unix.el
@@ -175,7 +175,7 @@ Otherwise, Emacs will attempt to use rsh to invoke du on the remote machine."
   'info arg1'      => OTHERWISE goes to top info window and then menu item arg1
   'info arg1 arg2' => does action for arg1 (either visit-file or menu-item) and then menu item arg2
   etc."
-  (require 'info)
+  (eval-and-compile (require 'info))
   (let ((file (cond
                 ((not (stringp (car args)))
                  nil)

diff --git a/lisp/eshell/esh-mode.el b/lisp/eshell/esh-mode.el
index fd3cfb939961d18af33d606e34955a86625a1c65..b8f88981b04f478369eae3e50514f304a969f122 100644 (file)
--- a/lisp/eshell/esh-mode.el
+++ b/lisp/eshell/esh-mode.el
@@ -1078,7 +1078,7 @@ This function could be in the list `eshell-output-filter-functions'."
 
 (defun eshell-handle-ansi-color ()
   "Handle ANSI color codes."
-  (require 'ansi-color)
+  (eval-and-compile (require 'ansi-color))
   (ansi-color-apply-on-region eshell-last-output-start
                               eshell-last-output-end))
 

diff --git a/lisp/obsolete/fast-lock.el b/lisp/obsolete/fast-lock.el
index 569771143e30dcc18d777ebdd6bc09dab6e2d015..dd33fe0b461634915e2ac8d386b49513bc51be50 100644 (file)
--- a/lisp/obsolete/fast-lock.el
+++ b/lisp/obsolete/fast-lock.el
@@ -768,7 +768,7 @@ See `fast-lock-get-face-properties'."
 \f
 ;; Functions for XEmacs:
 
-(when (save-match-data (string-match "XEmacs" (emacs-version)))
+(when (featurep 'xemacs)
   ;;
   ;; It would be better to use XEmacs' `map-extents' over extents with a
   ;; `font-lock' property, but `face' properties are on different extents.

diff --git a/lisp/progmodes/cc-engine.el b/lisp/progmodes/cc-engine.el
index d1a27d567fd219e4347127720cbee17f03228e5a..a019f59891895ebfc8e3ad30274b3149afff083e 100644 (file)
--- a/lisp/progmodes/cc-engine.el
+++ b/lisp/progmodes/cc-engine.el
@@ -4035,6 +4035,9 @@ comment at the start of cc-engine.el for more info."
              c-found-types)
     (sort type-list 'string-lessp)))
 
+;; Shut up the byte compiler.
+(defvar c-maybe-stale-found-type)
+
 (defun c-trim-found-types (beg end old-len)
   ;; An after change function which, in conjunction with the info in
   ;; c-maybe-stale-found-type (set in c-before-change), removes a type

diff --git a/lisp/progmodes/dcl-mode.el b/lisp/progmodes/dcl-mode.el
index 887416f906913f4158d7ebff2cf49a5563c375b3..135d90b21f44477a3e9c8529174c682d2cbb8e05 100644 (file)
--- a/lisp/progmodes/dcl-mode.el
+++ b/lisp/progmodes/dcl-mode.el
@@ -72,7 +72,7 @@
 ;;; Code:
 
 (require 'tempo)
-
+(eval-when-compile (require 'imenu))
 
 ;;; *** Customization *****************************************************
 

diff --git a/lisp/progmodes/gud.el b/lisp/progmodes/gud.el
index d2384232686e7e86c83d2ddcffc20aefa06b8db9..8cde32da422ff02469c063e0fd6273caa962e9db 100644 (file)
--- a/lisp/progmodes/gud.el
+++ b/lisp/progmodes/gud.el
@@ -106,6 +106,9 @@ Used to grey out relevant toolbar icons.")
 
 (defvar gdb-ready nil)
 
+(defvar gud-target-name "--unknown--"
+  "The apparent name of the program being debugged in a gud buffer.")
+
 ;; Use existing Info buffer, if possible.
 (defun gud-goto-info ()
   "Go to relevant Emacs info node."
@@ -2451,9 +2454,6 @@ comint mode, which see."
   :group 'gud
   :type 'boolean)
 
-(defvar gud-target-name "--unknown--"
-  "The apparent name of the program being debugged in a gud buffer.")
-
 ;; Perform initializations common to all debuggers.
 ;; The first arg is the specified command line,
 ;; which starts with the program to debug.

diff --git a/lisp/w32-fns.el b/lisp/w32-fns.el
index f37b4dcb789e05a86cf827ff878c1cf97978b407..3a3695466fa9286105c7136c06b17837c3bf9bfa 100644 (file)
--- a/lisp/w32-fns.el
+++ b/lisp/w32-fns.el
@@ -34,6 +34,7 @@
 ;; audio bell initialized.
 
 ;;; Code:
+(require 'w32-vars)
 
 (defvar explicit-shell-file-name)