[Emacs-diffs] Changes to emacs/lisp/calc/calc-vec.el,v

[Jay Belanger]

CVSROOT:        /cvsroot/emacs
Module name:    emacs
Changes by:     Jay Belanger <jpb>      08/09/20 22:07:18

Index: calc-vec.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/calc/calc-vec.el,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -b -r1.24 -r1.25
--- calc-vec.el 6 May 2008 03:15:56 -0000       1.24
+++ calc-vec.el 20 Sep 2008 22:07:17 -0000      1.25
@@ -1294,18 +1294,24 @@
 (defun calcFunc-venum (a)
   (setq a (calcFunc-vfloor a t))
   (or (math-constp a) (math-reject-arg a "*Set must be finite"))
-  (let ((p a) next)
-    (while (cdr p)
-      (setq next (cdr p))
-      (if (eq (car-safe (nth 1 p)) 'intv)
-         (setcdr p (nconc (cdr (calcFunc-index (math-add
-                                                (math-sub (nth 3 (nth 1 p))
-                                                          (nth 2 (nth 1 p)))
+  (let* ((prev a) (this (cdr prev)) this-val next this-last)
+    (while this
+      (setq next (cdr this)
+                       this-val (car this))
+      (if (eq (car-safe this-val) 'intv)
+                 (progn
+                       (setq this (cdr (calcFunc-index (math-add
+                                                                               
         (math-sub (nth 3 this-val)
+                                                                               
                           (nth 2 this-val))
                                                 1)
-                                               (nth 2 (nth 1 p))))
-                          (cdr (cdr p)))))
-      (setq p next))
-    a))
+                                                                               
        (nth 2 this-val))))
+                       (setq this-last (last this))
+                       (setcdr this-last next)
+                       (setcdr prev this)
+                       (setq prev this-last))
+               (setq prev this))
+         (setq this next)))
+  a)
 
 (defun calcFunc-vpack (a)
   (setq a (calcFunc-vfloor a t))