X-Git-Url: https://code.delx.au/gnu-emacs/blobdiff_plain/07976ae3b816dea4fd541bbba862603d3132eb2c..eada086196ccb005ded188ac2e58d41f3682a125:/lisp/calc/calcalg2.el

diff --git a/lisp/calc/calcalg2.el b/lisp/calc/calcalg2.el
index 4bee751ad4..5fd5b35654 100644
--- a/lisp/calc/calcalg2.el
+++ b/lisp/calc/calcalg2.el
@@ -1,7 +1,6 @@
 ;;; calcalg2.el --- more algebraic functions for Calc
 
-;; Copyright (C) 1990, 1991, 1992, 1993, 2001, 2002, 2003, 2004,
-;;   2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
+;; Copyright (C) 1990-1993, 2001-2012 Free Software Foundation, Inc.
 
 ;; Author: David Gillespie <daveg@synaptics.com>
 ;; Maintainer: Jay Belanger <jay.p.belanger@gmail.com>
@@ -668,21 +667,18 @@
 (defvar math-integral-limit)
 
 (defmacro math-tracing-integral (&rest parts)
-  (list 'and
-	'trace-buffer
-	(list 'with-current-buffer
-	      'trace-buffer
-	      '(goto-char (point-max))
-	      (list 'and
-		    '(bolp)
-		    '(insert (make-string (- math-integral-limit
-					     math-integ-level) 32)
-			     (format "%2d " math-integ-depth)
-			     (make-string math-integ-level 32)))
-	      ;;(list 'condition-case 'err
-		    (cons 'insert parts)
-		;;    '(error (insert (prin1-to-string err))))
-	      '(sit-for 0))))
+  `(and trace-buffer
+	(with-current-buffer trace-buffer
+	  (goto-char (point-max))
+	  (and (bolp)
+	       (insert (make-string (- math-integral-limit
+				       math-integ-level) 32)
+		       (format "%2d " math-integ-depth)
+		       (make-string math-integ-level 32)))
+	  ;;(condition-case err
+	  (insert ,@parts)
+	  ;;    (error (insert (prin1-to-string err))))
+	  (sit-for 0))))
 
 ;;; The following wrapper caches results and avoids infinite recursion.
 ;;; Each cache entry is: ( A B )          Integral of A is B;
@@ -3669,5 +3665,4 @@
 
 (provide 'calcalg2)
 
-;; arch-tag: f2932ec8-dd63-418b-a542-11a644b9d4c4
 ;;; calcalg2.el ends here