(calcFunc-venum): Properly handle intervals.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 9dd02596ef0be4948b5b8716e8bff6d8233528c4..1f0c6dd1678a9adedbac92009a7a3e95d6cd02a5 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2008-09-20  Vincent Belaïche  <vincent.b.1@hotmail.fr>
+
+       * calc/calc-vec.el (calcFunc-venum): Properly handle intervals.
+
 2008-09-20  Glenn Morris  <rgm@gnu.org>
 
        * emacs-lisp/lisp-mode.el (lisp-indent-offset):

diff --git a/lisp/calc/calc-vec.el b/lisp/calc/calc-vec.el
index 5ca08377147129a17a1cd6dd4514659be7c63c57..b0220cd89c23a21d99a8a16ab87e7fca2252c6e2 100644 (file)
--- a/lisp/calc/calc-vec.el
+++ b/lisp/calc/calc-vec.el
@@ -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)))
-                                                1)
-                                               (nth 2 (nth 1 p))))
-                          (cdr (cdr p)))))
-      (setq p next))
-    a))
+  (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 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))