[Emacs-diffs] emacs/lisp ChangeLog emacs-lisp/elint.el

[Glenn Morris]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Glenn Morris <gm>       09/09/12 22:32:55

Modified files:
        lisp           : ChangeLog 
        lisp/emacs-lisp: elint.el 

Log message:
        (elint-init-env): Skip non-list forms.
        (elint-log): Handle unknown file positions.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/ChangeLog?cvsroot=emacs&r1=1.16152&r2=1.16153
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/emacs-lisp/elint.el?cvsroot=emacs&r1=1.28&r2=1.29

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/emacs/emacs/lisp/ChangeLog,v
retrieving revision 1.16152
retrieving revision 1.16153
diff -u -b -r1.16152 -r1.16153
--- ChangeLog   12 Sep 2009 19:04:24 -0000      1.16152
+++ ChangeLog   12 Sep 2009 22:32:52 -0000      1.16153
@@ -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  <address@hidden>
 

Index: emacs-lisp/elint.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/emacs-lisp/elint.el,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -b -r1.28 -r1.29
--- emacs-lisp/elint.el 12 Sep 2009 18:48:25 -0000      1.28
+++ emacs-lisp/elint.el 12 Sep 2009 22:32:55 -0000      1.29
@@ -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)))
+                            (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))))