(check-declare-errmsg): Fix counting in the `full' case.

2 files changed, 15 insertions, 1 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 719b5a4948d..ab373f14766 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,17 @@
+2008-04-29  Glenn Morris  <rgm@gnu.org>
+
+        * calendar/calendar.el (calendar-nth-named-absday)
+        (calendar-nth-named-day):
+        * calendar/diary-lib.el (diary-list-sexp-entries, diary-float):
+        * calendar/holidays.el (holiday-float): Doc fixes.
+
+        * emacs-lisp/check-declare.el (check-declare-errmsg): Fix counting in
+        the `full' case.
+
+        * org/org-agenda.el (calendar-iso-from-absolute):
+        * org/org.el (calendar-absolute-from-iso, calendar-iso-from-absolute):
+        Fix declarations.
+
 2008-04-28  Nick Roberts  <nickrob@snap.net.nz>
 
         * progmodes/gdb-ui.el (gdb-info-breakpoints-custom): Make breakpoint
diff --git a/lisp/emacs-lisp/check-declare.el b/lisp/emacs-lisp/check-declare.el
index 1b3d4dc2f6d..47dd57d7539 100644
--- a/lisp/emacs-lisp/check-declare.el
+++ b/lisp/emacs-lisp/check-declare.el
@@ -115,7 +115,7 @@ With optional argument FULL, sums the number of elements in each element."
         (when full
           (setq l 0)
           (dolist (e errlist)
-            (setq l (1+ l))))
+            (setq l (+ l (1- (length e))))))
         (format "%d problem%s found" l (if (= l 1) "" "s")))
     "OK"))