calc-mode.el (calc-set-simplify-mode): Use `cond' instead of nested `if's.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index bc0496e0ca6e2e555c3f87a7205b03bd3fc48ff5..abd61048c77c57ea1fe1ffaf354168aef5e59a41 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2012-08-01  Jay Belanger  <jay.p.belanger@gmail.com>
+
+       * calc/calc-mode.el (calc-set-simplify-mode): Use `cond' instead
+       of nested `if's.
+
 2012-08-01  Glenn Morris  <rgm@gnu.org>
 
        * progmodes/autoconf.el (autoconf-definition-regexp):

diff --git a/lisp/calc/calc-mode.el b/lisp/calc/calc-mode.el
index 333485d8f94be088eb8fdeb0895ff5b0aca58ba0..f64e37dc0bf80876b5ed369b83dfdb330baba406 100644 (file)
--- a/lisp/calc/calc-mode.el
+++ b/lisp/calc/calc-mode.el
@@ -497,11 +497,11 @@
 
 (defun calc-set-simplify-mode (mode arg msg)
   (calc-change-mode 'calc-simplify-mode
-                   (if arg
-                       (and (> (prefix-numeric-value arg) 0)
-                            mode)
-                     (and (not (eq calc-simplify-mode mode))
-                          mode)))
+                    (cond
+                     (arg mode)
+                     ((eq calc-simplify-mode mode)
+                      'alg)
+                     (t mode)))
   (message "%s" (if (eq calc-simplify-mode mode)
               msg
             "Algebraic simplification occurs by default")))