X-Git-Url: https://code.delx.au/gnu-emacs/blobdiff_plain/7c82f3e23e37cc848a38b1f8be7149fd672a6393..058f8a8d55a6b20c68ee9728c537bb8ce50dfe81:/lisp/calc/calc-rewr.el

diff --git a/lisp/calc/calc-rewr.el b/lisp/calc/calc-rewr.el
index 86bb340f4a..4b8bf73e0f 100644
--- a/lisp/calc/calc-rewr.el
+++ b/lisp/calc/calc-rewr.el
@@ -1,10 +1,8 @@
 ;;; calc-rewr.el --- rewriting functions for Calc
 
-;; Copyright (C) 1990, 1991, 1992, 1993, 2001, 2002, 2003, 2004,
-;;   2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
+;; Copyright (C) 1990-1993, 2001-2016 Free Software Foundation, Inc.
 
 ;; Author: David Gillespie <daveg@synaptics.com>
-;; Maintainer: Jay Belanger <jay.p.belanger@gmail.com>
 
 ;; This file is part of GNU Emacs.
 
@@ -1440,21 +1438,19 @@
 (put 'calcFunc-vxor  'math-rewrite-default '(vec))
 
 (defmacro math-rwfail (&optional back)
-  (list 'setq 'pc
-	(list 'and
-	      (if back
-		  '(setq btrack (cdr btrack))
-		'btrack)
-	      ''((backtrack)))))
+  `(setq pc (and ,(if back
+		      '(setq btrack (cdr btrack))
+		    'btrack)
+		 '((backtrack)))))
 
 ;; This monstrosity is necessary because the use of static vectors of
 ;; registers makes rewrite rules non-reentrant.  Yucko!
 (defmacro math-rweval (form)
-  (list 'let '((orig (car rules)))
-	'(setcar rules (quote (nil nil nil no-phase)))
-	(list 'unwind-protect
-	      form
-	      '(setcar rules orig))))
+  `(let ((orig (car rules)))
+     (setcar rules '(nil nil nil no-phase))
+     (unwind-protect
+	 ,form
+       (setcar rules orig))))
 
 (defvar math-rewrite-phase 1)