# HG changeset patch
# User Glenn Morris <rgm@gnu.org>
# Date 1252794772 0
# Node ID bbe883d49650670973447d73518cb37d9faf08eb
# Parent  3edc5799260af3a5fd8d0e7b4d5837b844c7a825
(elint-init-env): Skip non-list forms.
(elint-log): Handle unknown file positions.

diff -r 3edc5799260a -r bbe883d49650 lisp/ChangeLog
--- a/lisp/ChangeLog	Sat Sep 12 19:05:49 2009 +0000
+++ b/lisp/ChangeLog	Sat Sep 12 22:32:52 2009 +0000
@@ -18,6 +18,8 @@
 	1000.
 	(elint-add-required-env): Don't beep on error.
 	(elint-forms): In case of error, return ENV unchanged.
+	(elint-init-env): Skip non-list forms.
+	(elint-log): Handle unknown file positions.
 
 2009-09-12  Daiki Ueno  <ueno@unixuser.org>
 
diff -r 3edc5799260a -r bbe883d49650 lisp/emacs-lisp/elint.el
--- a/lisp/emacs-lisp/elint.el	Sat Sep 12 19:05:49 2009 +0000
+++ b/lisp/emacs-lisp/elint.el	Sat Sep 12 22:32:52 2009 +0000
@@ -298,6 +298,9 @@
       (setq form (elint-top-form-form (car forms))
 	    forms (cdr forms))
       (cond
+       ;; Eg nnmaildir seems to use [] as a form of comment syntax.
+       ((not (listp form))
+	(elint-error "Skipping non-list form `%s'" form))
        ;; Add defined variable
        ((memq (car form) '(defvar defconst defcustom))
 	(setq env (elint-env-add-var env (cadr form))))
@@ -686,10 +689,12 @@
 			       (if f
 				   (file-name-nondirectory f)
 				 (buffer-name)))
-			     (save-excursion
-			       (goto-char elint-current-pos)
-			       (1+ (count-lines (point-min)
-						(line-beginning-position))))
+			     (if (boundp 'elint-current-pos)
+				 (save-excursion
+				   (goto-char elint-current-pos)
+				   (1+ (count-lines (point-min)
+						    (line-beginning-position))))
+			       0)	; unknown position
 			     type
 			     (apply 'format string args))))