From: Glenn Morris <rgm@gnu.org>
Date: Fri, 18 Feb 2011 08:42:21 +0000 (-0800)
Subject: Silence prolog.el compilation.
X-Git-Tag: emacs-pretest-24.0.90~104^2~275^2~820
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=135dee5572ab4908ac313430392184daca883445;p=emacs.git

Silence prolog.el compilation.

* lisp/progmodes/prolog.el: Don't require compile when compiling.
  -- not using any macros from it, it's just a cheap way to silence the
  compiler that actually produces one warning.
(compilation-shell-minor-mode, compilation-error-regexp-alist)
(compilation-forget-errors, compilation-fake-loc)
(compilation-parse-errors-function, compilation-error-list): Declare.
(prolog-inferior-mode): Require 'compile.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 911bee76dbf..f5d7d63cb6f 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,11 @@
 2011-02-18  Glenn Morris  <rgm@gnu.org>
 
+	* progmodes/prolog.el: Don't require compile when compiling.
+	(compilation-shell-minor-mode, compilation-error-regexp-alist)
+	(compilation-forget-errors, compilation-fake-loc)
+	(compilation-parse-errors-function, compilation-error-list): Declare.
+	(prolog-inferior-mode): Require 'compile.
+
 	* emulation/cua-base.el (pc-selection-mode): Declare.
 
 	* emacs-lisp/eieio-custom.el: Set generated-autoload-file.
diff --git a/lisp/progmodes/prolog.el b/lisp/progmodes/prolog.el
index 86553f9496e..45d967e92d9 100644
--- a/lisp/progmodes/prolog.el
+++ b/lisp/progmodes/prolog.el
@@ -280,7 +280,6 @@
 ;;; Code:
 
 (eval-when-compile
-  (require 'compile)
   (require 'font-lock)
   ;; We need imenu everywhere because of the predicate index!
   (require 'imenu)
@@ -1126,6 +1125,8 @@ Actually this is just customized `prolog-mode'."
         (comint-send-string proc (string last-command-event))
       (call-interactively 'self-insert-command))))
 
+(declare-function 'compilation-shell-minor-mode "compile" (&optional arg))
+(defvar compilation-error-regexp-alist)
 
 (define-derived-mode prolog-inferior-mode comint-mode "Inferior Prolog"
   "Major mode for interacting with an inferior Prolog process.
@@ -1156,6 +1157,7 @@ imitating normal Unix input editing.
 
 To find out what version of Prolog mode you are running, enter
 `\\[prolog-mode-version]'."
+  (require 'compile)
   (setq comint-input-filter 'prolog-input-filter)
   (setq mode-line-process '(": %s"))
   (prolog-mode-variables)
@@ -1279,6 +1281,10 @@ the variable `prolog-prompt-regexp'."
 ;; Old consulting and compiling functions
 ;;------------------------------------------------------------
 
+(declare-function compilation-forget-errors "compile" ())
+(declare-function compilation-fake-loc "compile"
+                  (marker file &optional line col))
+
 (defun prolog-old-process-region (compilep start end)
   "Process the region limited by START and END positions.
 If COMPILEP is non-nil then use compilation, otherwise consulting."
@@ -1480,6 +1486,8 @@ Used for temporary files.")
 (defvar prolog-consult-compile-real-file nil
   "The file name of the buffer to compile/consult.")
 
+(defvar compilation-parse-errors-function)
+
 (defun prolog-consult-compile (compilep file &optional first-line)
   "Consult/compile FILE.
 If COMPILEP is non-nil, perform compilation, otherwise perform CONSULTING.
@@ -1541,6 +1549,8 @@ This function must be called from the source code buffer."
                 "\nConsulted.\n"))
       (set-process-filter process old-filter))))
 
+(defvar compilation-error-list)
+
 (defun prolog-parse-sicstus-compilation-errors (limit)
   "Parse the prolog compilation buffer for errors.
 Argument LIMIT is a buffer position limiting searching.