From 3cd79f623b94e3aeef6c08dde13128733e5e6dec Mon Sep 17 00:00:00 2001
From: Dan Nicolaescu <dann@ics.uci.edu>
Date: Sun, 21 Oct 2007 14:54:34 +0000
Subject: [PATCH] * progmodes/prolog.el: Undo previous change.
 (comint-prompt-regexp, comint-process-echoes): Pacify byte-compiler.

* progmodes/dcl-mode.el:
* play/yow.el:
* calendar/todo-mode.el:
* calendar/cal-hebrew.el:
* vc-hg.el: Undo previous change.

* vms-patch.el: Likewise.
(print-region-function): Pacify byte-compiler.
---
 lisp/ChangeLog              | 17 +++++++++++++++--
 lisp/calendar/cal-hebrew.el |  2 --
 lisp/calendar/todo-mode.el  |  3 +--
 lisp/play/yow.el            |  1 -
 lisp/progmodes/dcl-mode.el  |  1 -
 lisp/progmodes/prolog.el    |  4 ++--
 lisp/vc-hg.el               |  1 -
 lisp/vms-patch.el           |  4 +---
 8 files changed, 19 insertions(+), 14 deletions(-)

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index de0b965335f..e346d83e34d 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,18 @@
+2007-10-21  Dan Nicolaescu  <dann@ics.uci.edu>
+
+	* progmodes/prolog.el: Undo previous change.
+	(comint-prompt-regexp, comint-process-echoes): Pacify
+	byte-compiler.
+
+	* progmodes/dcl-mode.el:
+	* play/yow.el:
+	* calendar/todo-mode.el:
+	* calendar/cal-hebrew.el:
+	* vc-hg.el: Undo previous change.
+	
+	* vms-patch.el: Likewise.
+	(print-region-function): Pacify byte-compiler.
+
 2007-10-21  Michael Albinus  <michael.albinus@gmx.de>
 
 	* files.el (backup-buffer-copy): Call `copy-file' with non-nil
@@ -113,8 +128,6 @@
 	* term/x-win.el (x-gtk-stock-map, icon-map-list)
 	(x-gtk-map-stock): Delete duplicated definitions from merge.
 
-	* progmodes/octave-mod.el: Require octave-inf at compile time.
-
 	* progmodes/compile.el (compilation-skip-to-next-location)
 	(compilation-skip-threshold, compilation-skip-visited):
 	Move definitions earlier.
diff --git a/lisp/calendar/cal-hebrew.el b/lisp/calendar/cal-hebrew.el
index cd4eaa1d13e..02cc9bfabb2 100644
--- a/lisp/calendar/cal-hebrew.el
+++ b/lisp/calendar/cal-hebrew.el
@@ -45,8 +45,6 @@
 (defvar original-date)
 
 (require 'calendar)
-(eval-when-compile 
-  (require 'holidays))
 
 (defun hebrew-calendar-leap-year-p (year)
   "t if YEAR is a Hebrew calendar leap year."
diff --git a/lisp/calendar/todo-mode.el b/lisp/calendar/todo-mode.el
index 5a0a0a45049..13ef042f736 100644
--- a/lisp/calendar/todo-mode.el
+++ b/lisp/calendar/todo-mode.el
@@ -914,8 +914,7 @@ Number of entries for each category is given by `todo-print-priorities'."
 
 (eval-when-compile
   (defvar date)
-  (defvar entry)
-  (require 'calendar))
+  (defvar entry))
 
 ;; Read about this function in the setup instructions above!
 ;;;###autoload
diff --git a/lisp/play/yow.el b/lisp/play/yow.el
index db9768b0800..28fc453577b 100644
--- a/lisp/play/yow.el
+++ b/lisp/play/yow.el
@@ -35,7 +35,6 @@
 ;;; Code:
 
 (require 'cookie1)
-(eval-when-compile (require 'doctor))
 
 (defgroup yow nil
   "Quote random zippyisms."
diff --git a/lisp/progmodes/dcl-mode.el b/lisp/progmodes/dcl-mode.el
index 135d90b21f4..6a3e9e82d6e 100644
--- a/lisp/progmodes/dcl-mode.el
+++ b/lisp/progmodes/dcl-mode.el
@@ -72,7 +72,6 @@
 ;;; Code:
 
 (require 'tempo)
-(eval-when-compile (require 'imenu))
 
 ;;; *** Customization *****************************************************
 
diff --git a/lisp/progmodes/prolog.el b/lisp/progmodes/prolog.el
index 470988f4c14..3583f546754 100644
--- a/lisp/progmodes/prolog.el
+++ b/lisp/progmodes/prolog.el
@@ -31,8 +31,8 @@
 
 ;;; Code:
 
-(eval-when-compile (require 'comint))
-
+(defvar comint-prompt-regexp)
+(defvar comint-process-echoes)
 
 (defgroup prolog nil
   "Major mode for editing and running Prolog under Emacs."
diff --git a/lisp/vc-hg.el b/lisp/vc-hg.el
index 44d9b0d9292..872be45a2c1 100644
--- a/lisp/vc-hg.el
+++ b/lisp/vc-hg.el
@@ -481,7 +481,6 @@ REV is the revision to check out into WORKFILE."
     (vc-hg-incoming-mode)))
 
 ;; XXX maybe also add key bindings for these functions.
-(eval-when-compile (require 'log-view))
 (defun vc-hg-push ()
   (interactive)
   (let ((marked-list (log-view-get-marked)))
diff --git a/lisp/vms-patch.el b/lisp/vms-patch.el
index d465a2eeaba..39cec28d88d 100644
--- a/lisp/vms-patch.el
+++ b/lisp/vms-patch.el
@@ -27,9 +27,7 @@
 
 ;;; Code:
 
-(eval-when-compile
-  (require 'ps-print)
-  (require 'vmsproc))
+(defvar print-region-function)
 
 (setq auto-mode-alist (cons '(("\\.com\\'" . dcl-mode)) auto-mode-alist))
 
-- 
2.11.4.GIT