[Emacs-diffs] /srv/bzr/emacs/trunk r103334: Silence prolog.el compilation.

[Glenn Morris]

------------------------------------------------------------
revno: 103334
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Fri 2011-02-18 00:42:21 -0800
message:
  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.
modified:
  lisp/ChangeLog
  lisp/progmodes/prolog.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2011-02-18 08:17:20 +0000
+++ b/lisp/ChangeLog    2011-02-18 08:42:21 +0000
@@ -1,5 +1,11 @@
 2011-02-18  Glenn Morris  <address@hidden>
 
+       * 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.

=== modified file 'lisp/progmodes/prolog.el'
--- a/lisp/progmodes/prolog.el  2011-02-17 05:16:12 +0000
+++ b/lisp/progmodes/prolog.el  2011-02-18 08:42:21 +0000
@@ -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 @@
         (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 @@
 
 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 @@
 ;; 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 @@
 (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 @@
                 "\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.