changeset 58227:d7757127f475

(compilation-internal-error-properties): Fix up a transposition-typo. Check end-col before using it.
author Stefan Monnier <monnier@iro.umontreal.ca>
date Mon, 15 Nov 2004 04:51:50 +0000
parents 9c458eb445fd
children 4d76ea02ae1a
files lisp/progmodes/compile.el
diffstat 1 files changed, 4 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/lisp/progmodes/compile.el	Sun Nov 14 23:27:46 2004 +0000
+++ b/lisp/progmodes/compile.el	Mon Nov 15 04:51:50 2004 +0000
@@ -1,7 +1,7 @@
 ;;; compile.el --- run compiler as inferior of Emacs, parse error messages
 
-;; Copyright (C) 1985, 86, 87, 93, 94, 95, 96, 97, 98, 1999, 2001, 03, 2004
-;;  Free Software Foundation, Inc.
+;; Copyright (C) 1985, 1986, 1987, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
+;;   2001, 2003, 2004  Free Software Foundation, Inc.
 
 ;; Authors: Roland McGrath <roland@gnu.org>,
 ;;	    Daniel Pfeiffer <occitan@esperanto.org>
@@ -638,14 +638,14 @@
 	  (goto-char (marker-position marker))
 	  (when (or end-col end-line)
 	    (beginning-of-line (- (or end-line line) marker-line -1))
-	    (if (< end-col 0)
+	    (if (or (null end-col) (< end-col 0))
 		(end-of-line)
 	      (if compilation-error-screen-columns
 		  (move-to-column end-col)
 		(forward-char end-col)))
 	    (setq end-marker (list (point-marker))))
 	  (beginning-of-line (if end-line
-				 (- end-line line -1)
+				 (- line end-line -1)
 			       (- loc marker-line -1)))
 	  (if col
 	      (if compilation-error-screen-columns