From: Stefan Monnier <monnier@iro.umontreal.ca>
Date: Tue, 1 Feb 2011 16:33:17 +0000 (-0500)
Subject: * lisp/progmodes/compile.el (compilation-next-error): Check there's
X-Git-Tag: emacs-pretest-24.0.90~104^2~275^2~1048^2~36
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=7d1166478188fe1fe014d3b64c22641c4fac6a25;p=emacs.git

* lisp/progmodes/compile.el (compilation-next-error): Check there's
a message before using it.

Fixes: debbugs:7941
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index c134e21ea79..d482991e7c4 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2011-02-01  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	* progmodes/compile.el (compilation-next-error): Check there's
+	a message before using it (bug#7941).
+
 2011-02-01  Jay Belanger  <jay.p.belanger@gmail.com>
 
 	* calc/calc-mtx.el (math-lud-pivot-check): New function.
@@ -6,8 +11,8 @@
 
 2011-01-31  Alan Mackenzie  <acm@muc.de>
 
-	* progmodes/cc-cmds.el (c-forward-over-illiterals): Continue
-	parsing if we encounter a naked # (Bug#7595).
+	* progmodes/cc-cmds.el (c-forward-over-illiterals):
+	Continue parsing if we encounter a naked # (Bug#7595).
 	(c-beginning-of-statement): Avoid loop in locating the beginning
 	of a macro.
 
@@ -34,8 +39,8 @@
 
 2011-01-31  Kenichi Handa  <handa@m17n.org>
 
-	* international/quail.el (quail-keyboard-layout-alist): Remove
-	superfluous SPC for "pc105-uk" (bug#7927).
+	* international/quail.el (quail-keyboard-layout-alist):
+	Remove superfluous SPC for "pc105-uk" (bug#7927).
 
 2011-01-31  Glenn Morris  <rgm@gnu.org>
 
diff --git a/lisp/progmodes/compile.el b/lisp/progmodes/compile.el
index 5dde9ba9a98..df8e044d20a 100644
--- a/lisp/progmodes/compile.el
+++ b/lisp/progmodes/compile.el
@@ -2140,7 +2140,7 @@ looking for the next message."
   (or pt (setq pt (point)))
   (let* ((msg (get-text-property pt 'compilation-message))
          ;; `loc', `msg', and `last' are used by the compilation-loop macro.
-	 (loc (compilation--message->loc msg))
+	 (loc (and msg (compilation--message->loc msg)))
 	 last)
     (if (zerop n)
 	(unless (or msg			; find message near here
@@ -2154,8 +2154,7 @@ looking for the next message."
 						  (line-end-position)))
 	    (or (setq msg (get-text-property pt 'compilation-message))
 		(setq pt (point)))))
-      (setq last (compilation--loc->file-struct
-                  (compilation--message->loc msg)))
+      (setq last (compilation--loc->file-struct loc))
       (if (>= n 0)
 	  (compilation-loop > compilation-next-single-property-change 1-
 			    (if (get-buffer-process (current-buffer))