delete_temp_file fix

[bpt/emacs.git] / lisp / calc / calc-map.el

diff --git a/lisp/calc/calc-map.el b/lisp/calc/calc-map.el
index 05002a6..2c591be 100644 (file)
--- a/lisp/calc/calc-map.el
+++ b/lisp/calc/calc-map.el
@@ -1,7 +1,6 @@
 ;;; calc-map.el --- higher-order functions for Calc
 
-;; Copyright (C) 1990, 1991, 1992, 1993, 2001, 2002, 2003, 2004,
-;;   2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+;; Copyright (C) 1990-1993, 2001-2014 Free Software Foundation, Inc.
 
 ;; Author: David Gillespie <daveg@synaptics.com>
 ;; Maintainer: Jay Belanger <jay.p.belanger@gmail.com>
@@ -33,8 +32,7 @@
 (defun calc-apply (&optional oper)
   (interactive)
   (calc-wrapper
-   (let* ((sel-mode nil)
-         (calc-dollar-values (mapcar 'calc-get-stack-element
+   (let* ((calc-dollar-values (mapcar #'calc-get-stack-element
                                      (nthcdr calc-stack-top calc-stack)))
          (calc-dollar-used 0)
          (oper (or oper (calc-get-operator "Apply"
@@ -54,11 +52,10 @@
 (defun calc-reduce (&optional oper accum)
   (interactive)
   (calc-wrapper
-   (let* ((sel-mode nil)
-         (nest (calc-is-hyperbolic))
+   (let* ((nest (calc-is-hyperbolic))
          (rev (calc-is-inverse))
          (nargs (if (and nest (not rev)) 2 1))
-         (calc-dollar-values (mapcar 'calc-get-stack-element
+         (calc-dollar-values (mapcar #'calc-get-stack-element
                                      (nthcdr calc-stack-top calc-stack)))
          (calc-dollar-used 0)
          (calc-mapping-dir (and (not accum) (not nest) ""))
@@ -100,8 +97,7 @@
 (defun calc-map (&optional oper)
   (interactive)
   (calc-wrapper
-   (let* ((sel-mode nil)
-         (calc-dollar-values (mapcar 'calc-get-stack-element
+   (let* ((calc-dollar-values (mapcar #'calc-get-stack-element
                                      (nthcdr calc-stack-top calc-stack)))
          (calc-dollar-used 0)
          (calc-mapping-dir "")
@@ -121,8 +117,7 @@
 (defun calc-map-equation (&optional oper)
   (interactive)
   (calc-wrapper
-   (let* ((sel-mode nil)
-         (calc-dollar-values (mapcar 'calc-get-stack-element
+   (let* ((calc-dollar-values (mapcar #'calc-get-stack-element
                                      (nthcdr calc-stack-top calc-stack)))
          (calc-dollar-used 0)
          (oper (or oper (calc-get-operator "Map-equation")))
@@ -153,8 +148,7 @@
 (defun calc-outer-product (&optional oper)
   (interactive)
   (calc-wrapper
-   (let* ((sel-mode nil)
-         (calc-dollar-values (mapcar 'calc-get-stack-element
+   (let* ((calc-dollar-values (mapcar #'calc-get-stack-element
                                      (nthcdr calc-stack-top calc-stack)))
          (calc-dollar-used 0)
          (oper (or oper (calc-get-operator "Outer" 2))))
@@ -171,8 +165,7 @@
 (defun calc-inner-product (&optional mul-oper add-oper)
   (interactive)
   (calc-wrapper
-   (let* ((sel-mode nil)
-         (calc-dollar-values (mapcar 'calc-get-stack-element
+   (let* ((calc-dollar-values (mapcar #'calc-get-stack-element
                                      (nthcdr calc-stack-top calc-stack)))
          (calc-dollar-used 0)
          (mul-oper (or mul-oper (calc-get-operator "Inner (Mult)" 2)))
@@ -572,7 +565,7 @@
             (and nargs forcenargs (/= nargs forcenargs) (>= nargs 0)
                  (error "Must be a %d-argument operator" nargs)))
            ((memq key '(?\$ ?\'))
-            (let* ((arglist nil)
+            (let* ((math-arglist nil)
                    (has-args nil)
                    (record-entry nil)
                    (expr (if (eq key ?\$)
@@ -592,13 +585,13 @@
                              (if (> calc-dollar-used 0)
                                  (progn
                                    (setq has-args calc-dollar-used
-                                         arglist (calc-invent-args has-args))
+                                         math-arglist (calc-invent-args has-args))
                                    (math-multi-subst (car func)
-                                                     (reverse arglist)
-                                                     arglist))
+                                                     (reverse math-arglist)
+                                                     math-arglist))
                                (if (> calc-hashes-used 0)
                                    (setq has-args calc-hashes-used
-                                         arglist (calc-invent-args has-args)))
+                                         math-arglist (calc-invent-args has-args)))
                                (car func))))))
               (if (eq (car-safe expr) 'calcFunc-lambda)
                   (setq oper (list "$" (- (length expr) 2) expr)
@@ -607,16 +600,16 @@
                     (progn
                       (calc-default-formula-arglist expr)
                       (setq record-entry t
-                            arglist (sort arglist 'string-lessp))
+                            math-arglist (sort math-arglist 'string-lessp))
                       (if calc-verify-arglist
-                          (setq arglist (read-from-minibuffer
+                          (setq math-arglist (read-from-minibuffer
                                          "Function argument list: "
-                                         (if arglist
-                                             (prin1-to-string arglist)
+                                         (if math-arglist
+                                             (prin1-to-string math-arglist)
                                            "()")
                                          minibuffer-local-map
                                          t)))
-                      (setq arglist (mapcar (function
+                      (setq math-arglist (mapcar (function
                                              (lambda (x)
                                                (list 'var
                                                      x
@@ -624,10 +617,10 @@
                                                       (concat
                                                        "var-"
                                                        (symbol-name x))))))
-                                            arglist))))
+                                            math-arglist))))
                 (setq oper (list "$"
-                                 (length arglist)
-                                 (append '(calcFunc-lambda) arglist
+                                 (length math-arglist)
+                                 (append '(calcFunc-lambda) math-arglist
                                          (list expr)))
                       done t))
               (if record-entry
@@ -1274,5 +1267,4 @@
 
 (provide 'calc-map)
 
-;; arch-tag: 980eac49-00e0-4870-b72a-e726b74c7990
 ;;; calc-map.el ends here