[Emacs-diffs] /srv/bzr/emacs/trunk r107683: * emacs-lisp/bytecomp.el (byte-compile-constants-vector): Allow more

[Stefan Monnier]

------------------------------------------------------------
revno: 107683
committer: Stefan Monnier <address@hidden>
branch nick: trunk
timestamp: Mon 2012-03-26 15:10:00 -0400
message:
  * emacs-lisp/bytecomp.el (byte-compile-constants-vector): Allow more
  than 197 variables.
modified:
  lisp/ChangeLog
  lisp/emacs-lisp/bytecomp.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2012-03-26 03:08:15 +0000
+++ b/lisp/ChangeLog    2012-03-26 19:10:00 +0000
@@ -1,3 +1,8 @@
+2012-03-26  Stefan Monnier  <address@hidden>
+
+       * emacs-lisp/bytecomp.el (byte-compile-constants-vector): Allow more
+       than 197 variables.
+
 2012-03-26  Ami Fischman  <address@hidden>
 
        * vc/vc-git.el (vc-git-state): Avoid unnecessarily locking.

=== modified file 'lisp/emacs-lisp/bytecomp.el'
--- a/lisp/emacs-lisp/bytecomp.el       2012-02-09 21:51:03 +0000
+++ b/lisp/emacs-lisp/bytecomp.el       2012-03-26 19:10:00 +0000
@@ -2694,7 +2694,8 @@
         (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 @@
          (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)))))