2 files changed, 9 insertions, 3 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index a9cb5a519d0..93ae0f12862 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2012-03-26  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * emacs-lisp/bytecomp.el (byte-compile-constants-vector): Allow more
+        than 197 variables.
+
 2012-03-26  Ami Fischman  <ami@fischman.org>
 
         * vc/vc-git.el (vc-git-state): Avoid unnecessarily locking.
diff --git a/lisp/emacs-lisp/bytecomp.el b/lisp/emacs-lisp/bytecomp.el
index 2ee878e5213..93c6518d215 100644
--- a/lisp/emacs-lisp/bytecomp.el
+++ b/lisp/emacs-lisp/bytecomp.el
@@ -2694,7 +2694,8 @@ If FORM is a lambda or a macro, byte-compile it as a function."
          (limits '(5                    ; Use the 1-byte varref codes,
                    63  ; 1-constlim     ;  1-byte byte-constant codes,
                    255                  ;  2-byte varref codes,
-                   65535))              ;  3-byte codes for the rest.
+                   65535                ;  3-byte codes for the rest.
+                   65535))              ;  twice since we step when we swap.
          limit)
     (while (or rest other)
       (setq limit (car limits))
@@ -2708,8 +2709,8 @@ If FORM is a lambda or a macro, byte-compile it as a function."
           (setcdr (car rest) (setq i (1+ i)))
           (setq ret (cons (car rest) ret))))
         (setq rest (cdr rest)))
-      (setq limits (cdr limits)
-            rest (prog1 other
+      (setq limits (cdr limits)         ;Step
+            rest (prog1 other           ;&Swap.
                    (setq other rest))))
     (apply 'vector (nreverse (mapcar 'car ret)))))