(inferior-prolog-error-regexp-alist): New var.

(inferior-prolog-mode): Use it.
(inferior-prolog-load-file): Reset list of errors.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 81f2152b08af9580817768c576e4497304dbc291..d7fc48c0e22d90eeacb38a3dfbca83e3c4ccd242 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2009-08-19  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+       * progmodes/prolog.el (inferior-prolog-error-regexp-alist): New var.
+       (inferior-prolog-mode): Use it.
+       (inferior-prolog-load-file): Reset list of errors.
+
 2009-08-19  ARISAWA Akihiro  <ari@mbf.ocn.ne.jp>  (tiny change)
 
        * language/tibetan.el ("Tibetan"): Fix sample-text entry.

diff --git a/lisp/progmodes/prolog.el b/lisp/progmodes/prolog.el
index b62255fbf912edee9e61f360411bf0af6efe29b5..d422d85b13a0d6d566ae33135813001c48a1b65d 100644 (file)
--- a/lisp/progmodes/prolog.el
+++ b/lisp/progmodes/prolog.el
@@ -238,6 +238,11 @@ rigidly along with this one (not yet)."
 (defvar inferior-prolog-mode-syntax-table prolog-mode-syntax-table)
 (defvar inferior-prolog-mode-abbrev-table prolog-mode-abbrev-table)
 
+(defvar inferior-prolog-error-regexp-alist
+  ;; GNU Prolog used to not follow the GNU standard format.
+  '(("^\\(.*?\\):\\([0-9]+\\) error: .*(char:\\([0-9]+\\)" 1 2 3)
+    gnu))
+
 (declare-function comint-mode "comint")
 (declare-function comint-send-string "comint" (process string))
 (declare-function comint-send-region "comint" (process start end))
@@ -268,6 +273,9 @@ Return not at end copies rest of line to end and sends it.
 \\[comint-interrupt-subjob] interrupts the shell or its current subjob if any.
 \\[comint-stop-subjob] stops. \\[comint-quit-subjob] sends quit signal."
   (setq comint-prompt-regexp "^| [ ?][- ] *")
+  (set (make-local-variable 'compilation-error-regexp-alist)
+       inferior-prolog-error-regexp-alist)
+  (compilation-shell-minor-mode)
   (prolog-mode-variables))
 
 (defvar inferior-prolog-buffer nil)
@@ -357,6 +365,10 @@ With prefix argument \\[universal-prefix], prompt for the program to use."
              (save-excursion
                (goto-char (- pmark 3))
                (looking-at " \\? ")))
+        ;; This is GNU prolog waiting to know whether you want more answers
+        ;; or not (or abort, etc...).  The answer is a single char, not
+        ;; a line, so pass this char directly rather than wait for RET to
+        ;; send a whole line.
         (comint-send-string proc (string last-command-event))
       (call-interactively 'self-insert-command))))
 
@@ -389,6 +401,7 @@ If COMPILE (prefix arg) is not nil, use compile mode rather than consult mode."
   (let ((file buffer-file-name)
         (proc (inferior-prolog-process)))
     (with-current-buffer (process-buffer proc)
+      (compilation-forget-errors)
       (comint-send-string proc (concat "['" (file-relative-name file) "'].\n"))
       (pop-to-buffer (current-buffer)))))